diff --git a/change_log.txt b/change_log.txt
index 5977581..f46aa0d 100644
--- a/change_log.txt
+++ b/change_log.txt
@@ -1,4 +1,6 @@
 v1.1.8
+Responsive CSS improvements - CHANGED
+is_bbpress called without checking if bbpress is active - FIXED
 Remove send to friend functionality as it against the GDPR policy - CHANGED
 
 v1.1.7
diff --git a/content.php b/content.php
index 3c29df5..3648b16 100644
--- a/content.php
+++ b/content.php
@@ -42,7 +42,7 @@
             <?php
             global $more;
             $more = 0;
-            if (is_singular() || is_bbpress()) {
+            if (is_singular() || ( function_exists('is_bbpress') && is_bbpress() )) {
                 the_content();
             } else {
                 directory_theme_post_thumbnail();
diff --git a/functions.php b/functions.php
index 06ef075..6affd7c 100644
--- a/functions.php
+++ b/functions.php
@@ -17,7 +17,7 @@
  * Define some constants for later use.
  */
 if (!defined('SD_DEFAULT_FEATURED_IMAGE')) define('SD_DEFAULT_FEATURED_IMAGE', get_stylesheet_directory_uri() . "/images/featured.jpg");
-if (!defined('SD_VERSION')) define('SD_VERSION', "1.1.6");
+if (!defined('SD_VERSION')) define('SD_VERSION', "1.1.8");
 if (!defined('SD_CHILD')) define('SD_CHILD', 'supreme-directory');
 
 /**
diff --git a/inc/geodirectory-compatibility.php b/inc/geodirectory-compatibility.php
index a32139f..dbc7c4a 100644
--- a/inc/geodirectory-compatibility.php
+++ b/inc/geodirectory-compatibility.php
@@ -20,10 +20,11 @@
 function sd_before_listing_content_search()
 {
     if (sd_is_non_location_cpt()) {
-        return;
+        add_action('geodir_search_content', 'sd_search_form_on_search_page', 4);
+    }else{
+        add_action('geodir_search_content', 'sd_search_form_on_search_page', 4);
+        add_action('geodir_listings_content', 'sd_search_form_on_search_page', 4);
     }
-    add_action('geodir_search_content', 'sd_search_form_on_search_page', 4);
-    add_action('geodir_listings_content', 'sd_search_form_on_search_page', 4);
 }
 
 add_action('wp', 'sd_before_listing_content_search');
diff --git a/languages/en_US.mo b/languages/en_US.mo
index f8c36a9..0d8673c 100644
Binary files a/languages/en_US.mo and b/languages/en_US.mo differ
diff --git a/languages/en_US.po b/languages/en_US.po
index 8846d5b..5340697 100644
--- a/languages/en_US.po
+++ b/languages/en_US.po
@@ -1,9 +1,9 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: Supreme Directory 1.1.7\n"
+"Project-Id-Version: Supreme Directory 1.1.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-01-04 11:54+0000\n"
-"PO-Revision-Date: 2018-01-04 11:54+0000\n"
+"POT-Creation-Date: 2018-05-25 18:36+0100\n"
+"PO-Revision-Date: 2018-05-25 18:36+0100\n"
 "Last-Translator: \n"
 "Language-Team: GD Team <info@wpgeodirectory.com>\n"
 "Language: en_US\n"
@@ -40,7 +40,7 @@ msgstr ""
 msgid "Pages:"
 msgstr ""
 
-#: content.php:62 inc/geodirectory-compatibility.php:752
+#: content.php:62 inc/geodirectory-compatibility.php:747
 msgid "Edit"
 msgstr ""
 
@@ -173,64 +173,64 @@ msgstr ""
 msgid " - Powered by %s."
 msgstr ""
 
-#: inc/geodirectory-compatibility.php:197
+#: inc/geodirectory-compatibility.php:198
 msgid "SEARCH LISTINGS"
 msgstr ""
 
-#: inc/geodirectory-compatibility.php:199
+#: inc/geodirectory-compatibility.php:200
 msgid "SHOW LISTINGS"
 msgstr ""
 
-#: inc/geodirectory-compatibility.php:201
+#: inc/geodirectory-compatibility.php:202
 msgid "SHOW MAP"
 msgstr ""
 
-#: inc/geodirectory-compatibility.php:719
+#: inc/geodirectory-compatibility.php:714
 msgid "Verified Owner"
 msgstr ""
 
-#: inc/geodirectory-compatibility.php:726
+#: inc/geodirectory-compatibility.php:721
 msgid "Claim Me"
 msgstr ""
 
+#: inc/geodirectory-compatibility.php:771
 #: inc/geodirectory-compatibility.php:776
-#: inc/geodirectory-compatibility.php:781
-#: inc/geodirectory-compatibility.php:793
+#: inc/geodirectory-compatibility.php:788
 msgid "Claim"
 msgstr ""
 
-#: inc/geodirectory-compatibility.php:858
+#: inc/geodirectory-compatibility.php:853
 msgid "Write a Review"
 msgstr ""
 
-#: inc/geodirectory-compatibility.php:895
-#: inc/geodirectory-compatibility.php:905
+#: inc/geodirectory-compatibility.php:887
+#: inc/geodirectory-compatibility.php:897
 msgid "Share on Facebook"
 msgstr ""
 
-#: inc/geodirectory-compatibility.php:898
-#: inc/geodirectory-compatibility.php:907
+#: inc/geodirectory-compatibility.php:890
+#: inc/geodirectory-compatibility.php:899
 msgid "Share on Twitter"
 msgstr ""
 
+#: inc/geodirectory-compatibility.php:893
 #: inc/geodirectory-compatibility.php:901
-#: inc/geodirectory-compatibility.php:909
 msgid "Share on Google Plus"
 msgstr ""
 
-#: inc/geodirectory-compatibility.php:979
+#: inc/geodirectory-compatibility.php:971
 msgid "Near Me"
 msgstr ""
 
-#: inc/geodirectory-compatibility.php:1123
+#: inc/geodirectory-compatibility.php:1115
 msgid "Listings"
 msgstr ""
 
-#: inc/geodirectory-compatibility.php:1129
+#: inc/geodirectory-compatibility.php:1121
 msgid "Favorites"
 msgstr ""
 
-#: inc/geodirectory-compatibility.php:1233
+#: inc/geodirectory-compatibility.php:1225
 msgid "%s Tags: %l"
 msgstr ""
 
diff --git a/style.css b/style.css
index 9eda3d3..b9d86d1 100644
--- a/style.css
+++ b/style.css
@@ -5,7 +5,7 @@ Description: A Supreme Child Theme for Directory Starter, check out this video t
 Author: GeoDirectory
 Author URI: https://wpgeodirectory.com/
 Template: directory-starter
-Version: 1.1.7
+Version: 1.1.8
 License: GPLv2 or greater
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 Text Domain: supreme-directory
@@ -1516,6 +1516,8 @@ MOBILE TOGGLE MAP/LISTINGS START
         position: absolute;
         z-index: 99999999999;
         display: block;
+        max-width: inherit;
+        padding: 5px 50px 0 0;
     }
 
     .sd .author-link a {