diff --git a/www/application/controllers/Member.php b/www/application/controllers/Member.php
index e7b9b449..c4975083 100644
--- a/www/application/controllers/Member.php
+++ b/www/application/controllers/Member.php
@@ -637,7 +637,7 @@ class Member extends Users_Controller {
     public function faq() {
         $data = $this->getSessionArray();
         $data['faq_table'] = '';
-        $query = $this->db->query(' SELECT * FROM faq WHERE status = 1 LIMIT 6');
+        $query = $this->db->query(' SELECT * FROM faq WHERE status = 1');
         $data['faq_table_row'] = $query->result();
 
         foreach ($query->result() as $row) {
diff --git a/www/application/views/users/view_faq.php b/www/application/views/users/view_faq.php
index fa65c8b5..9c7ea926 100644
--- a/www/application/views/users/view_faq.php
+++ b/www/application/views/users/view_faq.php
@@ -23,6 +23,7 @@
                     <h2 class="text-gray-800 fw-bolder mb-4">Performing Tasks</h2>
                     <?
                     foreach ($faq_table_row as $rr){
+                        if($rr->code=='PERFTASK'){
                         ?>
                         <div class="m-0">
                                 <div class="d-flex align-items-center collapsible py-3 toggle collapsed mb-0" data-bs-toggle="collapse" data-bs-target="#kt_job_<?=$rr->id?>">
@@ -50,7 +51,7 @@
                         </div>
 
                     <?
-                    }
+                    }  }
                     ?>
                 </div>
 
@@ -58,6 +59,7 @@
                     <h2 class="text-gray-800 fw-bolder mb-4">Setting Tasks up</h2>
                     <?
                     foreach ($faq_table_row as $rr){
+                      if($rr->code=='TSKSETUP')  {
                         ?>
                         <div class="m-0">
                             <div class="d-flex align-items-center collapsible py-3 toggle collapsed mb-0" data-bs-toggle="collapse" data-bs-target="#kt_job_4_2">
@@ -85,7 +87,7 @@
                         </div>
 
                         <?
-                    }
+                    }}
                     ?>
                 </div>
                 <!--end::Col-->
@@ -98,6 +100,7 @@
                     <h2 class="text-gray-800 w-bolder mb-4">Getting Paid</h2>
                     <?
                     foreach ($faq_table_row as $rr){
+                      if($rr->code=='GETPAID')  {
                         ?>
                         <div class="m-0">
                             <div class="d-flex align-items-center collapsible py-3 toggle collapsed mb-0" data-bs-toggle="collapse" data-bs-target="#kt_job_<?=$rr->id?>">
@@ -125,7 +128,7 @@
                         </div>
 
                         <?
-                    }
+                    }}
                     ?>
                 </div>
                 <!--end::Col-->
@@ -135,6 +138,7 @@
                     <h2 class="text-gray-800 fw-bolder mb-4">WrenchBoard Rewards</h2>
                     <?
                     foreach ($faq_table_row as $rr){
+                       if($rr->code=='REWARDS') {
                         ?>
                         <div class="m-0">
                             <div class="d-flex align-items-center collapsible py-3 toggle collapsed mb-0" data-bs-toggle="collapse" data-bs-target="#kt_job_<?=$rr->id?>">
@@ -162,7 +166,7 @@
                         </div>
 
                         <?
-                    }
+                    }}
                     ?>
                 </div>
                 <!--end::Col-->