diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 00000000..0d603085
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,90 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  quality:
+    name: Quality
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: "8.1"
+          tools: composer:v2
+
+      - name: Validate Composer files
+        working-directory: src
+        run: composer validate --no-check-publish
+
+      - name: Lint PHP
+        run: git ls-files -z '*.php' | xargs -0 -n1 php -l
+
+      - name: Validate Docker Compose configuration
+        run: docker compose config --quiet
+
+  php-syntax:
+    name: PHP ${{ matrix.php }} syntax
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php: ["7.4", "8.1"]
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php }}
+
+      - name: Lint PHP
+        run: git ls-files -z '*.php' | xargs -0 -n1 php -l
+
+  wordpress-tests:
+    name: WordPress ${{ matrix.wordpress }} tests
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        wordpress: ["6.7", "latest"]
+    services:
+      mariadb:
+        image: mariadb:10.11
+        env:
+          MYSQL_DATABASE: wordpress_test
+          MYSQL_ROOT_PASSWORD: root
+        ports:
+          - 3306:3306
+        options: >-
+          --health-cmd="healthcheck.sh --connect --innodb_initialized"
+          --health-interval=10s
+          --health-timeout=5s
+          --health-retries=5
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: "8.1"
+          extensions: mysqli
+          tools: composer:v2, phpunit:9.6
+
+      - name: Install Composer dependencies
+        working-directory: src
+        run: composer install --no-interaction --no-progress --prefer-dist
+
+      - name: Install WordPress test library
+        working-directory: src
+        run: bash tests/install-wp-tests.sh wordpress_test root root 127.0.0.1 ${{ matrix.wordpress }} true
+
+      - name: Run tests
+        working-directory: src
+        run: phpunit
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index bf365074..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-dist: trusty
-language: php
-
-php:
-    - 5.6
-    - 7.1
-
-env:
-    - WP_VERSION=latest WP_MULTISITE=0
-    - WP_VERSION=latest WP_MULTISITE=1
-    - WP_VERSION=4.0 WP_MULTISITE=0
-    - WP_VERSION=4.0 WP_MULTISITE=1
-
-before_script:
-    - composer self-update
-    - make deps
-    - chmod +x src/tests/init.sh && bash src/tests/init.sh $TRAVIS_PHP_VERSION $WP_VERSION
-
-script: cd src && phpunit
diff --git a/src/assets/css/simply-rets-client.css b/src/assets/css/simply-rets-client.css
index fae3731d..4bdc54b2 100644
--- a/src/assets/css/simply-rets-client.css
+++ b/src/assets/css/simply-rets-client.css
@@ -36,6 +36,24 @@ sizes with this class.
 ```
 
 */
+/*
+Accessibility: Text meant only for screen readers.
+Matches the standard WordPress screen-reader-text class.
+*/
+.screen-reader-text {
+    border: 0;
+    clip: rect(1px, 1px, 1px, 1px);
+    -webkit-clip-path: inset(50%);
+    clip-path: inset(50%);
+    height: 1px;
+    margin: -1px;
+    overflow: hidden;
+    padding: 0;
+    position: absolute;
+    width: 1px;
+    word-wrap: normal !important;
+}
+
 .sr-listing {
     position: relative;
     display: block;
@@ -187,6 +205,8 @@ div#sr-contact-form-error {
     background-color: #eee;
 }
 
+.sr-primary-data h2,
+.sr-primary-data h3,
 .sr-primary-data h4 {
     padding-left: 15px;
     margin-top: 10px !important;
@@ -615,6 +635,7 @@ Most of these elements also have id's for you to use specifically.
     clear: both;
 }
 
+#sr-search-wrapper h2,
 #sr-search-wrapper h3 {
     margin-top: 0px;
 }
@@ -938,6 +959,8 @@ elsewhere, this should be a breeze.
         clear: both;
     }
 
+    .sr-primary-data h2,
+    .sr-primary-data h3,
     .sr-primary-data h4 {
         padding-right: 15px;
     }
diff --git a/src/assets/js/simply-rets-client.js b/src/assets/js/simply-rets-client.js
index 615f1c92..15780b04 100644
--- a/src/assets/js/simply-rets-client.js
+++ b/src/assets/js/simply-rets-client.js
@@ -133,6 +133,18 @@ var normalizeListingPhotoUrl = function (url) {
     }
 }
 
+var escapeHtml = function (value) {
+    return String(value).replace(/[&<>"']/g, function (character) {
+        return {
+            '&': '&amp;',
+            '<': '&lt;',
+            '>': '&gt;',
+            '"': '&quot;',
+            "'": '&#039;'
+        }[character];
+    });
+}
+
 
 var genMarkerPopup = function (
     listing,
@@ -155,7 +167,7 @@ var genMarkerPopup = function (
     var sqft = listing.property.area || "n/a";
     var mlnum = listing.listingId || "n/a";
     var price = listing.listPrice || "Unknown";
-    var addr = listing.address.full || "Unknown";
+    var addr = escapeHtml(listing.address.full || "Unknown");
     var photo = listing.photos.length > 1
         ? normalizeListingPhotoUrl(listing.photos[0])
         : 'https://s3-us-west-2.amazonaws.com/simplyrets/trial/properties/defprop.jpg';
@@ -194,7 +206,7 @@ var genMarkerPopup = function (
         '  </div>' +
         '  <hr>' +
         '  <div class="sr-iw-inner__view-details">' +
-        '    <a class="sr-iw-inner__details-link" href="' + link + '">View Details</a>' +
+        '    <a class="sr-iw-inner__details-link" href="' + link + '" aria-label="View details for ' + addr + '">View Details<span class="screen-reader-text"> for ' + addr + '</span></a>' +
         '  </div>' +
         '</div>';
 
diff --git a/src/simply-rets-maps.php b/src/simply-rets-maps.php
index 6cd23f18..601da531 100644
--- a/src/simply-rets-maps.php
+++ b/src/simply-rets-maps.php
@@ -164,8 +164,9 @@ public static function infoWindowMarkup(
             <div class="sr-iw-inner__view-details">
                 <a
                     href="<?php echo esc_url($link); ?>"
-                    class='sr-iw-inner__details-link'>
-                    View Details
+                    class='sr-iw-inner__details-link'
+                    aria-label="<?php echo esc_attr('View details for ' . $address); ?>">
+                    View Details<span class="screen-reader-text"> <?php echo esc_html('for ' . $address); ?></span>
                 </a>
             </div>
         </div>
diff --git a/src/simply-rets-openhouses.php b/src/simply-rets-openhouses.php
index 53430299..f6f158df 100644
--- a/src/simply-rets-openhouses.php
+++ b/src/simply-rets-openhouses.php
@@ -105,6 +105,18 @@ public static function openHousesSearchResults($search_response, $settings) {
             return SrMessages::noResultsMsg($res);
         } else {
 
+            $results_heading_raw = apply_filters('simplyrets_results_heading_tag', 'h2');
+            $results_heading = tag_escape($results_heading_raw);
+            if (empty($results_heading)) {
+                $results_heading = 'h2';
+            }
+            $show_results_heading = apply_filters('simplyrets_show_results_heading', false);
+            $results_heading_text = apply_filters('simplyrets_openhouses_heading_text', 'Open Houses');
+
+            if ($show_results_heading && !empty($res)) {
+                $markup .= "<{$results_heading} class='sr-listings-heading screen-reader-text'>" . esc_html($results_heading_text) . "</{$results_heading}>";
+            }
+
             // Generate markup for each open house result
             foreach ($res as $idx => $oh) {
                 $markup .= SimplyRetsOpenHouses::openHouseSearchResultMarkup(
@@ -191,6 +203,12 @@ public static function openHouseSearchResultMarkup($openhouse, $settings) {
 
         $sqft = !empty($living_area) ? "<strong>SqFt: </strong>{$living_area} sqft<br/>" : "";
 
+        $listing_heading_raw = apply_filters('simplyrets_listing_heading_tag', 'h4');
+        $listing_heading = tag_escape($listing_heading_raw);
+        if (empty($listing_heading)) {
+            $listing_heading = 'h4';
+        }
+
         ob_start();
 ?>
         <hr>
@@ -207,12 +225,12 @@ class="sr-photo"
             <div class="sr-listing-data-wrapper">
                 <div class="sr-primary-data">
                     <a href="<?php echo esc_url($details_link); ?>">
-                        <h4>
+                        <<?php echo $listing_heading; ?> class="sr-listing-address">
                             <?php echo esc_html($full_address); ?>
                             <small class="sr-price">
                                 <i> - <?php echo esc_html($list_price_fmtd); ?></i>
                             </small>
-                        </h4>
+                        </<?php echo $listing_heading; ?>>
                     </a>
                 </div>
                 <div class="sr-secondary-data">
@@ -231,7 +249,7 @@ class="sr-photo"
             <div class="more-details-wrapper">
                 <span style="visibility:hidden">clearfix</span>
                 <span class="more-details-link" style="float:right">
-                    <a href="<?php echo esc_url($details_link); ?>">More details</a>
+                    <a href="<?php echo esc_url($details_link); ?>" aria-label="<?php echo esc_attr('More details for ' . $full_address); ?>">More details<span class="screen-reader-text"> <?php echo esc_html('for ' . $full_address); ?></span></a>
                 </span>
                 <span class="result-compliance-markup">
                     <?php echo wp_kses_post($compliance_markup); ?>
diff --git a/src/simply-rets-renderer.php b/src/simply-rets-renderer.php
index 31443f98..5689cc60 100644
--- a/src/simply-rets-renderer.php
+++ b/src/simply-rets-renderer.php
@@ -1052,6 +1052,20 @@ public static function srResidentialResultsGenerator($request_response, $setting
             $map->setAutoZoom(true);
         }
 
+        $listing_heading_raw = apply_filters('simplyrets_listing_heading_tag', 'h4');
+        $listing_heading = tag_escape($listing_heading_raw);
+        if (empty($listing_heading)) {
+            $listing_heading = 'h4';
+        }
+
+        $results_heading_raw = apply_filters('simplyrets_results_heading_tag', 'h2');
+        $results_heading = tag_escape($results_heading_raw);
+        if (empty($results_heading)) {
+            $results_heading = 'h2';
+        }
+        $show_results_heading = apply_filters('simplyrets_show_results_heading', false);
+        $results_heading_text = apply_filters('simplyrets_results_heading_text', 'Listings');
+
         $resultsMarkup = "";
         foreach ($response as $listing) {
             $listing_uid        = $listing->mlsId;
@@ -1258,11 +1272,11 @@ public static function srResidentialResultsGenerator($request_response, $setting
                     . '  <div class="sr-listing-data-wrapper">'
                     . '    <div class="sr-primary-data">'
                     . '      <a href="' . $link . '">'
-                    . '        <h4>' . $full_address
+                    . '        <' . $listing_heading . ' class="sr-listing-address">' . $full_address
                     . '          <small class="sr-price">'
                     . '            <i> - ' . $price_to_display . '</i>'
                     . '          </small>'
-                    . '        </h4>'
+                    . '        </' . $listing_heading . '>'
                     . '      </a>'
                     . '    </div>'
                     . '    <div class="sr-secondary-data">'
@@ -1280,7 +1294,7 @@ public static function srResidentialResultsGenerator($request_response, $setting
                     . '  </div>'
                     . '  <div class="more-details-wrapper">'
                     . '    <span class="more-details-link">'
-                    . '        <a href="' . $link . '">More details</a>'
+                    . '        <a href="' . $link . '" aria-label="' . esc_attr('More details for ' . $full_address) . '">More details<span class="screen-reader-text"> ' . esc_html('for ' . $full_address) . '</span></a>'
                     . '    </span>'
                     . '    <span class="result-compliance-markup">'
                     .        $compliance_markup
@@ -1304,11 +1318,11 @@ public static function srResidentialResultsGenerator($request_response, $setting
                     . '  <div class="sr-listing-data-wrapper">'
                     . '    <div class="sr-primary-data">'
                     . '      <a href="' . $link . '">'
-                    . '        <h4>' . $full_address
+                    . '        <' . $listing_heading . ' class="sr-listing-address">' . $full_address
                     . '          <small class="sr-price">'
                     . '            <i> - ' . $price_to_display . '</i>'
                     . '          </small>'
-                    . '        </h4>'
+                    . '        </' . $listing_heading . '>'
                     . '      </a>'
                     . '    </div>'
                     . '    <div class="sr-secondary-data">'
@@ -1326,7 +1340,7 @@ public static function srResidentialResultsGenerator($request_response, $setting
                     . '  </div>'
                     . '  <div class="more-details-wrapper">'
                     . '    <span class="more-details-link">'
-                    . '        <a href="' . $link . '">More details</a>'
+                    . '        <a href="' . $link . '" aria-label="' . esc_attr('More details for ' . $full_address) . '">More details<span class="screen-reader-text"> ' . esc_html('for ' . $full_address) . '</span></a>'
                     . '    </span>'
                     . '    <span class="result-compliance-markup">'
                     .        $compliance_markup
@@ -1336,8 +1350,12 @@ public static function srResidentialResultsGenerator($request_response, $setting
             }
         }
 
+        $results_heading_markup = ($show_results_heading && !empty($response))
+            ? "<{$results_heading} class='sr-listings-heading screen-reader-text'>" . esc_html($results_heading_text) . "</{$results_heading}>"
+            : "";
         $markupGridViewClass = $grid_view == true ? "sr-listings-grid-view" : "";
         $resultsMarkup = "<div id='sr-listings-results-list' class='{$markupGridViewClass}'>"
+            . $results_heading_markup
             . "{$resultsMarkup}"
             . "</div>";
         $markerCount > 0 ? $mapMarkup = $mapHelper->render($map) : $mapMarkup = '';
@@ -1474,6 +1492,8 @@ public static function srWidgetListingGenerator($response, $settings) {
 
     public static function srContactFormMarkup($listing) {
         $custom_form = get_option('sr_leadcapture_custom_form', false);
+        static $form_instance = 0;
+        $form_id = 'sr-contact-form-' . ++$form_instance;
 
         // Use custom form if configured
         if ($custom_form != false) {
@@ -1485,36 +1505,42 @@ public static function srContactFormMarkup($listing) {
         // Process any form submissions
         $submission_message = SimplyRetsContactForm::srContactFormDeliver();
 
+        $contact_heading_raw = apply_filters('simplyrets_contact_heading_tag', 'h3');
+        $contact_heading = tag_escape($contact_heading_raw);
+        if (empty($contact_heading)) {
+            $contact_heading = 'h3';
+        }
+
         // Default lead capture form
         $markup = '';
         $markup .= '<hr>';
         $markup .= '<div id="sr-contact-form">';
         $markup .= $submission_message;
-        $markup .= '<h3>Contact us about this listing</h3>';
+        $markup .= '<' . $contact_heading . '>Contact us about this listing</' . $contact_heading . '>';
         $markup .= '<form action="' . esc_url((isset($_SERVER['REQUEST_URI']) ? sanitize_url(wp_unslash($_SERVER['REQUEST_URI'])) : '')) . '#sr-contact-form-success" method="post">';
         $markup .= wp_nonce_field('sr_contact_action', 'sr_contact_nonce', true, false);
         $markup .= '<p>';
         $markup .= '<input type="hidden" name="sr-cf-listing" value="' . $listing . '" />';
-        $markup .= 'Your Name (required) <br/>';
-        $markup .= '<input type="text" name="sr-cf-name" value="'
+        $markup .= '<label for="' . esc_attr($form_id . '-name') . '">Your Name (required)</label><br/>';
+        $markup .= '<input id="' . esc_attr($form_id . '-name') . '" type="text" name="sr-cf-name" value="'
             // phpcs:ignore WordPress.Security.NonceVerification.Missing
             . (isset($_POST["sr-cf-name"]) ? esc_attr(sanitize_text_field(wp_unslash($_POST["sr-cf-name"]))) : '') . '" size="40" />';
         $markup .= '</p>';
         $markup .= '<p>';
-        $markup .= 'Your Email (required) <br/>';
-        $markup .= '<input type="email" name="sr-cf-email" value="'
+        $markup .= '<label for="' . esc_attr($form_id . '-email') . '">Your Email (required)</label><br/>';
+        $markup .= '<input id="' . esc_attr($form_id . '-email') . '" type="email" name="sr-cf-email" value="'
             // phpcs:ignore WordPress.Security.NonceVerification.Missing
             . (isset($_POST["sr-cf-email"]) ? esc_attr(sanitize_text_field(wp_unslash($_POST["sr-cf-email"]))) : '') . '" size="40" />';
         $markup .= '</p>';
         $markup .= '<p>';
-        $markup .= 'Subject (required) <br/>';
-        $markup .= '<input type="text" name="sr-cf-subject" value="'
+        $markup .= '<label for="' . esc_attr($form_id . '-subject') . '">Subject (required)</label><br/>';
+        $markup .= '<input id="' . esc_attr($form_id . '-subject') . '" type="text" name="sr-cf-subject" value="'
             // phpcs:ignore WordPress.Security.NonceVerification.Missing
             . (isset($_POST["sr-cf-subject"]) ? esc_attr(sanitize_text_field(wp_unslash($_POST["sr-cf-subject"]))) : '') . '" size="40" />';
         $markup .= '</p>';
         $markup .= '<p>';
-        $markup .= 'Your Message (required) <br/>';
-        $markup .= '<textarea rows="10" cols="35" name="sr-cf-message">'
+        $markup .= '<label for="' . esc_attr($form_id . '-message') . '">Your Message (required)</label><br/>';
+        $markup .= '<textarea id="' . esc_attr($form_id . '-message') . '" rows="10" cols="35" name="sr-cf-message">'
             // phpcs:ignore WordPress.Security.NonceVerification.Missing
             . (isset($_POST["sr-cf-message"]) ? esc_attr(sanitize_text_field(wp_unslash($_POST["sr-cf-message"]))) : '') . '</textarea>';
         $markup .= '</p>';
@@ -1653,6 +1679,8 @@ public static function renderMapSearchForm($atts) {
         $MLS_text = SrUtils::mkMLSText();
 
         if (!empty($atts['search_form'])) {
+            static $form_instance = 0;
+            $form_id = 'sr-map-search-form-' . ++$form_instance;
 
             $single_vendor = SrUtils::isSingleVendor();
             $allVendors    = get_option('sr_adv_search_meta_vendors', array());
@@ -1678,21 +1706,31 @@ public static function renderMapSearchForm($atts) {
                 }
             }
 
+            $search_heading_raw = apply_filters('simplyrets_search_heading_tag', 'h3');
+            $search_heading = tag_escape($search_heading_raw);
+            if (empty($search_heading)) {
+                $search_heading = 'h3';
+            }
+
             $search_form =
                 '<div class="sr-int-map-search-wrapper">'
                 . '  <div id="sr-search-wrapper">'
-                . '    <h3>Search Listings</h3>'
+                . '    <' . $search_heading . ' class="sr-search-heading">Search Listings</' . $search_heading . '>'
                 . '    <form method="get" class="sr-search sr-map-search-form">'
                 . '      <input type="hidden" name="sr-listings" value="sr-search">'
                 . '      <div class="sr-minmax-filters">'
                 . '        <div class="sr-search-field" id="sr-search-keywords">'
-                . '          <input name="sr_keywords"'
+                . '          <label for="' . esc_attr($form_id . '-keywords') . '" class="screen-reader-text">Search keywords</label>'
+                . '          <input id="' . esc_attr($form_id . '-keywords') . '"'
+                . '                 name="sr_keywords"'
                 . '                 type="text"'
+                . '                 aria-label="Search keywords"'
                 . '                 placeholder="Subdivision, Zipcode, ' . $MLS_text . ' Area, ' . $MLS_text . ' Number, or Market Area"'
                 . '          />'
                 . '        </div>'
                 . '        <div class="sr-search-field" id="sr-search-ptype">'
-                . '          <select name="sr_ptype">'
+                . '          <label for="' . esc_attr($form_id . '-ptype') . '" class="screen-reader-text">Property Type</label>'
+                . '          <select id="' . esc_attr($form_id . '-ptype') . '" name="sr_ptype" aria-label="Property Type">'
                 . '            <option value="">Property Type</option>'
                 .              $type_options
                 . '          </select>'
@@ -1700,22 +1738,28 @@ public static function renderMapSearchForm($atts) {
                 . '      </div>'
                 . '      <div class="sr-minmax-filters">'
                 . '        <div class="sr-search-field" id="sr-search-minprice">'
-                . '          <input name="sr_minprice" step="1000" min="0" type="number" placeholder="Min Price.." />'
+                . '          <label for="' . esc_attr($form_id . '-minprice') . '" class="screen-reader-text">Min Price</label>'
+                . '          <input id="' . esc_attr($form_id . '-minprice') . '" name="sr_minprice" step="1000" min="0" type="number" aria-label="Min Price" placeholder="Min Price.." />'
                 . '        </div>'
                 . '        <div class="sr-search-field" id="sr-search-maxprice">'
-                . '          <input name="sr_maxprice" step="1000" min="0" type="number" placeholder="Max Price.." />'
+                . '          <label for="' . esc_attr($form_id . '-maxprice') . '" class="screen-reader-text">Max Price</label>'
+                . '          <input id="' . esc_attr($form_id . '-maxprice') . '" name="sr_maxprice" step="1000" min="0" type="number" aria-label="Max Price" placeholder="Max Price.." />'
                 . '        </div>'
                 . '        <div class="sr-search-field" id="sr-search-minbeds">'
-                . '          <input name="sr_minbeds" min="0" type="number" placeholder="Min Beds.." />'
+                . '          <label for="' . esc_attr($form_id . '-minbeds') . '" class="screen-reader-text">Min Beds</label>'
+                . '          <input id="' . esc_attr($form_id . '-minbeds') . '" name="sr_minbeds" min="0" type="number" aria-label="Min Beds" placeholder="Min Beds.." />'
                 . '        </div>'
                 . '        <div class="sr-search-field" id="sr-search-maxbeds">'
-                . '          <input name="sr_maxbeds" min="0" type="number" placeholder="Max Beds.." />'
+                . '          <label for="' . esc_attr($form_id . '-maxbeds') . '" class="screen-reader-text">Max Beds</label>'
+                . '          <input id="' . esc_attr($form_id . '-maxbeds') . '" name="sr_maxbeds" min="0" type="number" aria-label="Max Beds" placeholder="Max Beds.." />'
                 . '        </div>'
                 . '        <div class="sr-search-field" id="sr-search-minbaths">'
-                . '          <input name="sr_minbaths" min="0" type="number" placeholder="Min Baths.." />'
+                . '          <label for="' . esc_attr($form_id . '-minbaths') . '" class="screen-reader-text">Min Baths</label>'
+                . '          <input id="' . esc_attr($form_id . '-minbaths') . '" name="sr_minbaths" min="0" type="number" aria-label="Min Baths" placeholder="Min Baths.." />'
                 . '        </div>'
                 . '        <div class="sr-search-field" id="sr-search-maxbaths">'
-                . '          <input name="sr_maxbaths" min="0" type="number" placeholder="Max Baths.." />'
+                . '          <label for="' . esc_attr($form_id . '-maxbaths') . '" class="screen-reader-text">Max Baths</label>'
+                . '          <input id="' . esc_attr($form_id . '-maxbaths') . '" name="sr_maxbaths" min="0" type="number" aria-label="Max Baths" placeholder="Max Baths.." />'
                 . '        </div>'
                 . '      </div>'
                 . '      <input type="hidden" name="sr_vendor"  value="' . $vendor . '" />'
@@ -1726,8 +1770,8 @@ public static function renderMapSearchForm($atts) {
                 . '      <div>'
                 . '          <input class="submit button btn" type="submit" value="Search Properties">'
                 . '          <div class="sr-sort-wrapper">'
-                . '              <label for="sr_sort">Sort by: </label>'
-                . '              <select class="select" name="sr_sort">'
+                . '              <label for="' . esc_attr($form_id . '-sort') . '">Sort by: </label>'
+                . '              <select id="' . esc_attr($form_id . '-sort') . '" class="select" name="sr_sort">'
                 . '                  <option value="">Sort Options</option>'
                 . '                  <option value="-modified"> Recently modified</option>'
                 . '                  <option value="-listprice"> Price - High to Low</option>'
@@ -1759,6 +1803,8 @@ public static function renderMapSearchForm($atts) {
 
     public static function renderSearchForm($atts) {
         ob_start();
+        static $form_instance = 0;
+        $form_id = 'sr-search-form-' . ++$form_instance;
         $home_url = get_home_url();
         $singleVendor = SrUtils::isSingleVendor();
         $MLS_text = SrUtils::mkMLSText();
@@ -1935,6 +1981,12 @@ public static function renderSearchForm($atts) {
         $q_placeholder = "Subdivision, Zipcode, "
             . $MLS_text . " area, " . $MLS_text . " #, etc";
 
+        $search_heading_raw = apply_filters('simplyrets_search_heading_tag', 'h3');
+        $search_heading = tag_escape($search_heading_raw);
+        if (empty($search_heading)) {
+            $search_heading = 'h3';
+        }
+
         if (array_key_exists('advanced', $attributes) && ($attributes['advanced'] == 'true' || $attributes['advanced'] == 'True')) {
 ?>
 
@@ -1942,21 +1994,25 @@ public static function renderSearchForm($atts) {
                 <form method="get" class="sr-search" action="<?php echo esc_url($home_url); ?>">
                     <input type="hidden" name="sr-listings" value="sr-search">
                     <input type="hidden" name="advanced" value="true">
-                    <h3>Advanced Listings Search</h3>
+                    <<?php echo $search_heading; ?> class="sr-search-heading">Advanced Listings Search</<?php echo $search_heading; ?>>
                     <div class="sr-adv-search-minmax sr-adv-search-part">
 
                         <div class="sr-adv-search-col1">
                             <!-- Keyword / Property Type -->
                             <div class="sr-minmax-filters">
                                 <div class="sr-search-field" id="sr-search-keywords">
-                                    <input name="sr_keywords"
+                                    <label for="<?php echo esc_attr($form_id . '-keywords'); ?>" class="screen-reader-text">Search keywords</label>
+                                    <input id="<?php echo esc_attr($form_id . '-keywords'); ?>"
+                                        name="sr_keywords"
                                         type="text"
+                                        aria-label="Search keywords"
                                         placeholder="<?php echo esc_attr($q_placeholder); ?>"
                                         value="<?php echo esc_attr($keywords); ?>" />
                                 </div>
 
                                 <div class="sr-search-field" id="sr-search-ptype">
-                                    <select name="sr_ptype">
+                                    <label for="<?php echo esc_attr($form_id . '-ptype'); ?>" class="screen-reader-text">Property Type</label>
+                                    <select id="<?php echo esc_attr($form_id . '-ptype'); ?>" name="sr_ptype" aria-label="Property Type">
                                         <?php
                                         // phpcs:ignore WordPress.Security.EscapeOutput
                                         echo $default_type_option;
@@ -1971,15 +2027,17 @@ public static function renderSearchForm($atts) {
                         <div class="sr-minmax-filters">
                             <div class="sr-adv-search-col2 sr-adv-search-price">
                                 <label><strong>Price Range</strong></label>
-                                <input step="1000" min="0" type="number" name="sr_minprice" placeholder="10000" value="<?php echo esc_attr($minprice); ?>" />
-                                <input step="1000" min="0" type="number" name="sr_maxprice" placeholder="1000000" value="<?php echo esc_attr($maxprice); ?>" />
+                                <label for="<?php echo esc_attr($form_id . '-minprice'); ?>" class="screen-reader-text">Min Price</label>
+                                <input id="<?php echo esc_attr($form_id . '-minprice'); ?>" step="1000" min="0" type="number" name="sr_minprice" aria-label="Min Price" placeholder="10000" value="<?php echo esc_attr($minprice); ?>" />
+                                <label for="<?php echo esc_attr($form_id . '-maxprice'); ?>" class="screen-reader-text">Max Price</label>
+                                <input id="<?php echo esc_attr($form_id . '-maxprice'); ?>" step="1000" min="0" type="number" name="sr_maxprice" aria-label="Max Price" placeholder="1000000" value="<?php echo esc_attr($maxprice); ?>" />
                             </div>
 
                             <div class="sr-adv-search-col4" id="sr-adv-minbeds">
-                                <label for="sr_minbeds" id="sr-adv-minbeds-label">
+                                <label for="<?php echo esc_attr($form_id . '-minbeds'); ?>" id="<?php echo esc_attr($form_id . '-minbeds-label'); ?>">
                                     <strong>Bedrooms</strong>
                                 </label>
-                                <select name="sr_minbeds" id="sr-adv-minbeds-select">
+                                <select name="sr_minbeds" id="<?php echo esc_attr($form_id . '-minbeds'); ?>">
                                     <option value="<?php echo esc_attr($minbeds); ?>">
                                         <?php echo esc_html($minbeds); ?>+
                                     </option>
@@ -1995,10 +2053,10 @@ public static function renderSearchForm($atts) {
                             </div>
 
                             <div class="sr-adv-search-col4" id="sr-adv-minbaths">
-                                <label for="sr_minbaths" id="sr-adv-minbaths-label">
+                                <label for="<?php echo esc_attr($form_id . '-minbaths'); ?>" id="<?php echo esc_attr($form_id . '-minbaths-label'); ?>">
                                     <strong>Bathrooms</strong>
                                 </label>
-                                <select name="sr_minbaths" id="sr-adv-minbaths-select">
+                                <select name="sr_minbaths" id="<?php echo esc_attr($form_id . '-minbaths'); ?>">
                                     <option value="<?php echo esc_attr($minbaths); ?>">
                                         <?php echo esc_attr($minbaths); ?>+
                                     </option>
@@ -2016,10 +2074,10 @@ public static function renderSearchForm($atts) {
 
                         <div class="sr-minmax-filters">
                             <div class="sr-adv-search-col2" id="sr-adv-status">
-                                <label for="status" id="sr-adv-status-label">
+                                <label for="<?php echo esc_attr($form_id . '-status'); ?>" id="<?php echo esc_attr($form_id . '-status-label'); ?>">
                                     <strong>Status</strong>
                                 </label>
-                                <select name="status" id="sr-adv-status-select">
+                                <select name="status" id="<?php echo esc_attr($form_id . '-status'); ?>">
                                     <option value="">All</option>
                                     <?php
                                     // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
@@ -2028,20 +2086,20 @@ public static function renderSearchForm($atts) {
                                 </select>
                             </div>
                             <div class="sr-adv-search-col4" id="sr-adv-lotsize">
-                                <label for="sr_lotsize"><strong>Lot Size</strong></label>
-                                <input type="number" name="sr_lotsize" placeholder="3500" value="<?php echo esc_attr($lotsize); ?>" />
+                                <label for="<?php echo esc_attr($form_id . '-lotsize'); ?>"><strong>Lot Size</strong></label>
+                                <input id="<?php echo esc_attr($form_id . '-lotsize'); ?>" type="number" name="sr_lotsize" placeholder="3500" value="<?php echo esc_attr($lotsize); ?>" />
                             </div>
                             <div class="sr-adv-search-col4" id="sr-adv-area">
-                                <label for="sr_area"><strong>Area (SqFt)</strong></label>
-                                <input type="number" name="sr_area" value="<?php echo esc_attr($area); ?>" placeholder="1500" />
+                                <label for="<?php echo esc_attr($form_id . '-area'); ?>"><strong>Area (SqFt)</strong></label>
+                                <input id="<?php echo esc_attr($form_id . '-area'); ?>" type="number" name="sr_area" value="<?php echo esc_attr($area); ?>" placeholder="1500" />
                             </div>
                         </div>
 
 
                         <div class="sr-minmax-filters">
                             <div class="sr-adv-search-col2" id="sr-adv-cities">
-                                <label><strong>Cities</strong></label>
-                                <select name='sr_cities[]' multiple>
+                                <label for="<?php echo esc_attr($form_id . '-cities'); ?>"><strong>Cities</strong></label>
+                                <select id="<?php echo esc_attr($form_id . '-cities'); ?>" name='sr_cities[]' multiple>
                                     <?php
                                     // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
                                     echo $city_options;
@@ -2050,8 +2108,8 @@ public static function renderSearchForm($atts) {
                             </div>
 
                             <div class="sr-adv-search-col2" id="sr-adv-neighborhoods">
-                                <label><strong>Locations</strong></label>
-                                <select name="sr_neighborhoods[]" multiple>
+                                <label for="<?php echo esc_attr($form_id . '-neighborhoods'); ?>"><strong>Locations</strong></label>
+                                <select id="<?php echo esc_attr($form_id . '-neighborhoods'); ?>" name="sr_neighborhoods[]" multiple>
                                     <?php
                                     // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
                                     echo $location_options;
@@ -2099,8 +2157,8 @@ public static function renderSearchForm($atts) {
                     <div>
                         <button class="btn button submit btn-submit" style="display:inline-block;">Search</button>
                         <div class="sr-sort-wrapper">
-                            <label for="sr_sort">Sort by: </label>
-                            <select name="sr_sort">
+                            <label for="<?php echo esc_attr($form_id . '-sort'); ?>">Sort by: </label>
+                            <select id="<?php echo esc_attr($form_id . '-sort'); ?>" name="sr_sort">
                                 <option value="-modified" <?php echo esc_attr($sort_price_mod); ?>> Recently modified</option>
                                 <option value="-listprice" <?php echo esc_attr($sort_price_hl); ?>> Price - High to Low</option>
                                 <option value="listprice" <?php echo esc_attr($sort_price_lh); ?>> Price - Low to High</option>
@@ -2119,20 +2177,24 @@ public static function renderSearchForm($atts) {
 
         ?>
         <div id="sr-search-wrapper">
-            <h3>Search Listings</h3>
+            <<?php echo $search_heading; ?> class="sr-search-heading">Search Listings</<?php echo $search_heading; ?>>
             <form method="get" class="sr-search" action="<?php echo esc_url($home_url); ?>">
                 <input type="hidden" name="sr-listings" value="sr-search">
 
                 <div class="sr-minmax-filters">
                     <div class="sr-search-field" id="sr-search-keywords">
-                        <input name="sr_keywords"
+                        <label for="<?php echo esc_attr($form_id . '-keywords'); ?>" class="screen-reader-text">Search keywords</label>
+                        <input id="<?php echo esc_attr($form_id . '-keywords'); ?>"
+                            name="sr_keywords"
                             type="text"
+                            aria-label="Search keywords"
                             placeholder="<?php echo esc_attr($q_placeholder); ?>"
                             value="<?php echo esc_attr($keywords); ?>" />
                     </div>
 
                     <div class="sr-search-field" id="sr-search-ptype">
-                        <select name="sr_ptype">
+                        <label for="<?php echo esc_attr($form_id . '-ptype'); ?>" class="screen-reader-text">Property Type</label>
+                        <select id="<?php echo esc_attr($form_id . '-ptype'); ?>" name="sr_ptype" aria-label="Property Type">
                             <?php
                             // phpcs:ignore WordPress.Security.EscapeOutput
                             echo $default_type_option;
@@ -2145,24 +2207,30 @@ public static function renderSearchForm($atts) {
 
                 <div class="sr-minmax-filters">
                     <div class="sr-search-field" id="sr-search-minprice">
-                        <input name="sr_minprice" step="1000" min="0" type="number" value="<?php echo esc_attr($minprice); ?>" placeholder="Min Price.." />
+                        <label for="<?php echo esc_attr($form_id . '-minprice'); ?>" class="screen-reader-text">Min Price</label>
+                        <input id="<?php echo esc_attr($form_id . '-minprice'); ?>" name="sr_minprice" step="1000" min="0" type="number" aria-label="Min Price" value="<?php echo esc_attr($minprice); ?>" placeholder="Min Price.." />
                     </div>
                     <div class="sr-search-field" id="sr-search-maxprice">
-                        <input name="sr_maxprice" step="1000" min="0" type="number" value="<?php echo esc_attr($maxprice); ?>" placeholder="Max Price.." />
+                        <label for="<?php echo esc_attr($form_id . '-maxprice'); ?>" class="screen-reader-text">Max Price</label>
+                        <input id="<?php echo esc_attr($form_id . '-maxprice'); ?>" name="sr_maxprice" step="1000" min="0" type="number" aria-label="Max Price" value="<?php echo esc_attr($maxprice); ?>" placeholder="Max Price.." />
                     </div>
 
                     <div class="sr-search-field" id="sr-search-minbeds">
-                        <input name="sr_minbeds" min="0" type="number" value="<?php echo esc_attr($minbeds); ?>" placeholder="Min Beds.." />
+                        <label for="<?php echo esc_attr($form_id . '-minbeds'); ?>" class="screen-reader-text">Min Beds</label>
+                        <input id="<?php echo esc_attr($form_id . '-minbeds'); ?>" name="sr_minbeds" min="0" type="number" aria-label="Min Beds" value="<?php echo esc_attr($minbeds); ?>" placeholder="Min Beds.." />
                     </div>
                     <div class="sr-search-field" id="sr-search-maxbeds">
-                        <input name="sr_maxbeds" min="0" type="number" value="<?php echo esc_attr($maxbeds); ?>" placeholder="Max Beds.." />
+                        <label for="<?php echo esc_attr($form_id . '-maxbeds'); ?>" class="screen-reader-text">Max Beds</label>
+                        <input id="<?php echo esc_attr($form_id . '-maxbeds'); ?>" name="sr_maxbeds" min="0" type="number" aria-label="Max Beds" value="<?php echo esc_attr($maxbeds); ?>" placeholder="Max Beds.." />
                     </div>
 
                     <div class="sr-search-field" id="sr-search-minbaths">
-                        <input name="sr_minbaths" min="0" type="number" value="<?php echo esc_attr($minbaths); ?>" placeholder="Min Baths.." />
+                        <label for="<?php echo esc_attr($form_id . '-minbaths'); ?>" class="screen-reader-text">Min Baths</label>
+                        <input id="<?php echo esc_attr($form_id . '-minbaths'); ?>" name="sr_minbaths" min="0" type="number" aria-label="Min Baths" value="<?php echo esc_attr($minbaths); ?>" placeholder="Min Baths.." />
                     </div>
                     <div class="sr-search-field" id="sr-search-maxbaths">
-                        <input name="sr_maxbaths" min="0" type="number" value="<?php echo esc_attr($maxbaths); ?>" placeholder="Max Baths.." />
+                        <label for="<?php echo esc_attr($form_id . '-maxbaths'); ?>" class="screen-reader-text">Max Baths</label>
+                        <input id="<?php echo esc_attr($form_id . '-maxbaths'); ?>" name="sr_maxbaths" min="0" type="number" aria-label="Max Baths" value="<?php echo esc_attr($maxbaths); ?>" placeholder="Max Baths.." />
                     </div>
                 </div>
 
@@ -2170,8 +2238,8 @@ public static function renderSearchForm($atts) {
                     <input class="submit button btn" type="submit" value="Search Properties">
 
                     <div class="sr-sort-wrapper">
-                        <label for="sr_sort">Sort by: </label>
-                        <select class="select" name="sr_sort">
+                        <label for="<?php echo esc_attr($form_id . '-sort'); ?>">Sort by: </label>
+                        <select id="<?php echo esc_attr($form_id . '-sort'); ?>" class="select" name="sr_sort">
                             <option value="-modified" <?php echo esc_attr($sort_price_mod); ?>> Recently modified</option>
                             <option value="-listprice" <?php echo esc_attr($sort_price_hl); ?>> Price - High to Low</option>
                             <option value="listprice" <?php echo esc_attr($sort_price_lh); ?>> Price - Low to High</option>
@@ -2215,6 +2283,8 @@ public static function renderSearchForm($atts) {
 
     public static function renderWidgetSearchForm($vendor, $type_options, $home_url) {
         ob_start();
+        static $form_instance = 0;
+        $form_id = 'sr-widget-search-form-' . ++$form_instance;
     ?>
         <div class="sr-search-widget">
             <form
@@ -2224,14 +2294,18 @@ class="sr-search"
                 <input type="hidden" name="sr-listings" value="sr-search">
 
                 <div class="sr-search-field" id="sr-search-keywords">
+                    <label for="<?php echo esc_attr($form_id . '-keywords'); ?>" class="screen-reader-text">Search keywords</label>
                     <input
+                        id="<?php echo esc_attr($form_id . '-keywords'); ?>"
                         name="sr_keywords"
                         type="text"
+                        aria-label="Search keywords"
                         placeholder="Subdivision, Zipcode, or Keywords" />
                 </div>
 
                 <div class="sr-search-field" id="sr-search-ptype">
-                    <select name="sr_ptype">
+                    <label for="<?php echo esc_attr($form_id . '-ptype'); ?>" class="screen-reader-text">Property Type</label>
+                    <select id="<?php echo esc_attr($form_id . '-ptype'); ?>" name="sr_ptype" aria-label="Property Type">
                         <option value="">Property Type</option>
                         <?php
                         // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped
@@ -2242,24 +2316,30 @@ class="sr-search"
 
                 <div class="sr-search-widget-filters">
                     <div class="sr-search-widget-field" id="sr-search-minprice">
-                        <input name="sr_minprice" step="1000" min="0" type="number" placeholder="Min Price.." />
+                        <label for="<?php echo esc_attr($form_id . '-minprice'); ?>" class="screen-reader-text">Min Price</label>
+                        <input id="<?php echo esc_attr($form_id . '-minprice'); ?>" name="sr_minprice" step="1000" min="0" type="number" aria-label="Min Price" placeholder="Min Price.." />
                     </div>
                     <div class="sr-search-widget-field" id="sr-search-maxprice">
-                        <input name="sr_maxprice" step="1000" min="0" type="number" placeholder="Max Price.." />
+                        <label for="<?php echo esc_attr($form_id . '-maxprice'); ?>" class="screen-reader-text">Max Price</label>
+                        <input id="<?php echo esc_attr($form_id . '-maxprice'); ?>" name="sr_maxprice" step="1000" min="0" type="number" aria-label="Max Price" placeholder="Max Price.." />
                     </div>
 
                     <div class="sr-search-widget-field" id="sr-search-minbeds">
-                        <input name="sr_minbeds" min="0" type="number" placeholder="Min Beds.." />
+                        <label for="<?php echo esc_attr($form_id . '-minbeds'); ?>" class="screen-reader-text">Min Beds</label>
+                        <input id="<?php echo esc_attr($form_id . '-minbeds'); ?>" name="sr_minbeds" min="0" type="number" aria-label="Min Beds" placeholder="Min Beds.." />
                     </div>
                     <div class="sr-search-widget-field" id="sr-search-maxbeds">
-                        <input name="sr_maxbeds" min="0" type="number" placeholder="Max Beds.." />
+                        <label for="<?php echo esc_attr($form_id . '-maxbeds'); ?>" class="screen-reader-text">Max Beds</label>
+                        <input id="<?php echo esc_attr($form_id . '-maxbeds'); ?>" name="sr_maxbeds" min="0" type="number" aria-label="Max Beds" placeholder="Max Beds.." />
                     </div>
 
                     <div class="sr-search-widget-field" id="sr-search-minbaths">
-                        <input name="sr_minbaths" min="0" type="number" placeholder="Min Baths.." />
+                        <label for="<?php echo esc_attr($form_id . '-minbaths'); ?>" class="screen-reader-text">Min Baths</label>
+                        <input id="<?php echo esc_attr($form_id . '-minbaths'); ?>" name="sr_minbaths" min="0" type="number" aria-label="Min Baths" placeholder="Min Baths.." />
                     </div>
                     <div class="sr-search-widget-field" id="sr-search-maxbaths">
-                        <input name="sr_maxbaths" min="0" type="number" placeholder="Max Baths.." />
+                        <label for="<?php echo esc_attr($form_id . '-maxbaths'); ?>" class="screen-reader-text">Max Baths</label>
+                        <input id="<?php echo esc_attr($form_id . '-maxbaths'); ?>" name="sr_maxbaths" min="0" type="number" aria-label="Max Baths" placeholder="Max Baths.." />
                     </div>
                 </div>
                 <input
diff --git a/src/tests/install-wp-tests.sh b/src/tests/install-wp-tests.sh
new file mode 100644
index 00000000..4f21d5ec
--- /dev/null
+++ b/src/tests/install-wp-tests.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+db_name=${1:-wordpress_test}
+db_user=${2:-root}
+db_pass=${3:-}
+db_host=${4:-localhost}
+wp_version=${5:-latest}
+skip_db_create=${6:-false}
+installer=/tmp/install-wp-tests.sh
+
+curl --fail --location --retry 3 --output "$installer" \
+    https://raw.githubusercontent.com/wp-cli/scaffold-command/8ad932fce7be1112707c7ac119f6f828cca075d4/templates/install-wp-tests.sh
+
+WP_INSTALL_TESTS_SKIP_UPDATE_CHECK=true \
+    bash "$installer" "$db_name" "$db_user" "$db_pass" "$db_host" "$wp_version" "$skip_db_create"
diff --git a/src/tests/test-plugin.php b/src/tests/test-plugin.php
index e197946d..2549aaa0 100644
--- a/src/tests/test-plugin.php
+++ b/src/tests/test-plugin.php
@@ -18,4 +18,18 @@ function testSingleListingRequest() {
 
         $this->assertTrue(is_string($result));
     }
+
+    function testWidgetSearchFormsUseUniqueControlIds() {
+        $first_form = SimplyRetsRenderer::renderWidgetSearchForm('', '', 'https://example.com');
+        $second_form = SimplyRetsRenderer::renderWidgetSearchForm('', '', 'https://example.com');
+
+        preg_match('/<input\s+id="([^"]+-keywords)"/', $first_form, $first_matches);
+        preg_match('/<input\s+id="([^"]+-keywords)"/', $second_form, $second_matches);
+
+        $this->assertCount(2, $first_matches);
+        $this->assertCount(2, $second_matches);
+        $this->assertNotSame($first_matches[1], $second_matches[1]);
+        $this->assertStringContainsString('for="' . $first_matches[1] . '"', $first_form);
+        $this->assertStringContainsString('for="' . $second_matches[1] . '"', $second_form);
+    }
 }