diff --git a/system/pages/houses.php b/system/pages/houses.php
index 32e318a0..5c596059 100644
--- a/system/pages/houses.php
+++ b/system/pages/houses.php
@@ -114,6 +114,7 @@ if(isset($config['lua']['houseCleanOld'])) {
     $cleanOldHouse = (int)(eval('return ' . $config['lua']['houseCleanOld'] . ';') / (24 * 60 * 60));
 }
 
+$housesSearch = false;
 if(isset($_POST['town']) && isset($_POST['state']) && isset($_POST['order']) && (isset($_POST['type']) || !$db->hasColumn('houses', 'guild')))
 {
     $townName = $config['towns'][$_POST['town']];
@@ -146,7 +147,6 @@ if(isset($_POST['town']) && isset($_POST['state']) && isset($_POST['order']) &&
         $whereby .= ' AND `guild` ' . ($type == 'guildhalls' ? '!' : '') . '= 0';
 
     $houses_info = $db->query('SELECT * FROM `houses` WHERE ' . $whereby. ' ORDER BY ' . $orderby);
-    $houses_count = $houses_info->rowCount();
 
     $players_info = $db->query("SELECT `houses`.`id` AS `houseid` , `players`.`name` AS `ownername` FROM `houses` , `players` , `accounts` WHERE `players`.`id` = `houses`.`owner` AND `accounts`.`id` = `players`.`account_id`");
     $players = array();
@@ -175,6 +175,8 @@ if(isset($_POST['town']) && isset($_POST['state']) && isset($_POST['order']) &&
 
         $houses[] = array('owner' => $owner, 'name' => $house['name'], 'size' => $house['size'], 'rent' => $house['rent'], 'rentedBy' => $houseRent);
     }
+
+    $housesSearch = true;
 }
 
 $guild = $db->hasTable('houses', 'guild') ? ' or guildhall' : '';
@@ -187,6 +189,6 @@ $twig->display('houses.html.twig', array(
     'townId' => isset($_POST['town']) ? $_POST['town'] : null,
     'guild' => $guild,
     'cleanOldHouse' => isset($cleanOld) ? $cleanOld : null,
-    'housesCount' => isset($houses_count) ? $houses_count : null,
+    'housesSearch' => $housesSearch,
     'houses' => isset($houses) ? $houses : null
 ));
\ No newline at end of file
diff --git a/system/templates/houses.html.twig b/system/templates/houses.html.twig
index 16a8ce71..a87bf98a 100644
--- a/system/templates/houses.html.twig
+++ b/system/templates/houses.html.twig
@@ -31,54 +31,56 @@
                             <br><br>
                         {% endif %}
 
-                        {% if houses is not empty %}
+                        {% if houses is not empty or housesSearch %}
                         <table border="0" cellspacing="1" cellpadding="4" width="100%">
                             <tbody>
                                 <tr bgcolor="{{ config.vdarkborder }}">
-                                    <td colspan="6" class="white"><b>Available {{ houseType }} {% if townName is not empty %}in {{ townName }}{% endif %}on <b>{{ config.lua.serverName }}</b></b></td>
+                                    <td colspan="6" class="white"><b>Available {{ houseType }}{% if townName is not empty %} in {{ townName }}{% endif %} on <b>{{ config.lua.serverName }}</b></b></td>
                                 </tr>
 
                                 <tr bgcolor="{{ config.darkborder }}">
-                                    {% if housesCount > 0 %}
+                                    {% if houses is not empty %}
                                         <td width="40%"><b>Name</b></td>
                                         <td width="10%"><b>Size</b></td>
                                         <td width="10%"><b>Rent</b></td>
 
                                         <td width="40%"><b>Status</b></td>
                                         <td>&nbsp;</td>
-                                    {% else %}
+                                    {% elseif housesSearch %}
                                         <td>No {{ houseType }} with specified criterias.</td>
                                     {% endif %}
                                 </tr>
 
-                                {% set i = 0 %}
-                                {% for house in houses %}
-                                    {% set i = i + 1 %}
-                                    <tr bgcolor="{{ getStyle(i) }}">
-                                        <td width="40%">
-                                            {{ house.name }}
-                                        </td>
+                                {% if houses is not empty %}
+                                    {% set i = 0 %}
+                                    {% for house in houses %}
+                                        {% set i = i + 1 %}
+                                        <tr bgcolor="{{ getStyle(i) }}">
+                                            <td width="40%">
+                                                {{ house.name }}
+                                            </td>
 
-                                        <td width="10%">
-                                            {{ house.size }}
-                                        </td>
+                                            <td width="10%">
+                                                {{ house.size }}
+                                            </td>
 
-                                        <td width="10%">
-                                            {{ house.rent }} golds
-                                        </td>
+                                            <td width="10%">
+                                                {{ house.rent }} golds
+                                            </td>
 
-                                        <td width="40%">
-                                            {{ house.rentedBy|raw }}
-                                        </td>
+                                            <td width="40%">
+                                                {{ house.rentedBy|raw }}
+                                            </td>
 
-                                        <td>
-                                            <form action="{{ getLink('houses/view') }}" method="post">
-                                                <input type="hidden" name="house" value="{{ house.name }}">
-                                                <button name="View" alt="View" class="btn btn-secondary" width="120" height="18">View</button>
-                                            </form>
-                                        </td>
-                                    </tr>
-                                {% endfor %}
+                                            <td>
+                                                <form action="{{ getLink('houses/view') }}" method="post">
+                                                    <input type="hidden" name="house" value="{{ house.name }}">
+                                                    <button name="View" alt="View" class="btn btn-secondary" width="120" height="18">View</button>
+                                                </form>
+                                            </td>
+                                        </tr>
+                                    {% endfor %}
+                                {% endif %}
                             </tbody>
                         </table>
                         <br>