diff --git a/README.md b/README.md
index 86dae51..277fb9a 100644
--- a/README.md
+++ b/README.md
@@ -12,15 +12,15 @@ Just a basic Questions & Answers.
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Questions and Answers](https://www.vdm.io/)
 + *First Build*: 30th January, 2017
-+ *Last Build*: 6th January, 2021
++ *Last Build*: 8th February, 2021
 + *Version*: 1.0.x
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 # Component Number
 
-+ *Line count*: **30948**
-+ *File count*: **202**
++ *Line count*: **31340**
++ *File count*: **207**
 + *Folder count*: **63**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
diff --git a/admin/README.txt b/admin/README.txt
index 86dae51..277fb9a 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -12,15 +12,15 @@ Just a basic Questions & Answers.
 + *Author*: [Llewellyn van der Merwe](mailto:joomla@vdm.io)
 + *Name*: [Questions and Answers](https://www.vdm.io/)
 + *First Build*: 30th January, 2017
-+ *Last Build*: 6th January, 2021
++ *Last Build*: 8th February, 2021
 + *Version*: 1.0.x
 + *Copyright*: Copyright (C) 2015. All Rights Reserved
 + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
 
 # Component Number
 
-+ *Line count*: **30948**
-+ *File count*: **202**
++ *Line count*: **31340**
++ *File count*: **207**
 + *Folder count*: **63**
 
 > This **component** was build with a Joomla [Automated Component Builder](http://vdm.bz/component-builder).
diff --git a/admin/assets/css/admin.css b/admin/assets/css/admin.css
index c103554..d89fbf8 100644
--- a/admin/assets/css/admin.css
+++ b/admin/assets/css/admin.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		admin.css
diff --git a/admin/assets/css/dashboard.css b/admin/assets/css/dashboard.css
index f58e817..b49e5b0 100644
--- a/admin/assets/css/dashboard.css
+++ b/admin/assets/css/dashboard.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		dashboard.css
diff --git a/admin/assets/css/help_document.css b/admin/assets/css/help_document.css
index 295023b..8503fd2 100644
--- a/admin/assets/css/help_document.css
+++ b/admin/assets/css/help_document.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		help_document.css
diff --git a/admin/assets/css/help_documents.css b/admin/assets/css/help_documents.css
index dbd229e..fe92492 100644
--- a/admin/assets/css/help_documents.css
+++ b/admin/assets/css/help_documents.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		help_documents.css
diff --git a/admin/assets/css/question_and_answer.css b/admin/assets/css/question_and_answer.css
index d1a392b..3919a31 100644
--- a/admin/assets/css/question_and_answer.css
+++ b/admin/assets/css/question_and_answer.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		question_and_answer.css
diff --git a/admin/assets/css/questions_and_answers.css b/admin/assets/css/questions_and_answers.css
index cd7e507..f548612 100644
--- a/admin/assets/css/questions_and_answers.css
+++ b/admin/assets/css/questions_and_answers.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		questions_and_answers.css
diff --git a/admin/assets/js/admin.js b/admin/assets/js/admin.js
index c804745..da5dc62 100644
--- a/admin/assets/js/admin.js
+++ b/admin/assets/js/admin.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		admin.js
diff --git a/admin/controller.php b/admin/controller.php
index 441f39a..4c56112 100644
--- a/admin/controller.php
+++ b/admin/controller.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		controller.php
diff --git a/admin/controllers/ajax.json.php b/admin/controllers/ajax.json.php
index 37e1d27..bbc8aa9 100644
--- a/admin/controllers/ajax.json.php
+++ b/admin/controllers/ajax.json.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		ajax.json.php
diff --git a/admin/controllers/download.php b/admin/controllers/download.php
index 864c40e..531488a 100644
--- a/admin/controllers/download.php
+++ b/admin/controllers/download.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		download.php
diff --git a/admin/controllers/help.php b/admin/controllers/help.php
index 155ca9e..f2f2a82 100644
--- a/admin/controllers/help.php
+++ b/admin/controllers/help.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		help.php
diff --git a/admin/controllers/help_document.php b/admin/controllers/help_document.php
index 1444ad5..b3d3911 100644
--- a/admin/controllers/help_document.php
+++ b/admin/controllers/help_document.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		help_document.php
diff --git a/admin/controllers/help_documents.php b/admin/controllers/help_documents.php
index 7e73177..ac8e2d9 100644
--- a/admin/controllers/help_documents.php
+++ b/admin/controllers/help_documents.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		help_documents.php
diff --git a/admin/controllers/import.php b/admin/controllers/import.php
index 31e9188..2615225 100644
--- a/admin/controllers/import.php
+++ b/admin/controllers/import.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		import.php
diff --git a/admin/controllers/question_and_answer.php b/admin/controllers/question_and_answer.php
index 21464d4..df804f5 100644
--- a/admin/controllers/question_and_answer.php
+++ b/admin/controllers/question_and_answer.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		question_and_answer.php
diff --git a/admin/controllers/questions_and_answers.php b/admin/controllers/questions_and_answers.php
index b28cac1..b4bfc53 100644
--- a/admin/controllers/questions_and_answers.php
+++ b/admin/controllers/questions_and_answers.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		questions_and_answers.php
diff --git a/admin/controllers/questionsanswers.php b/admin/controllers/questionsanswers.php
index 829dc9f..39ba9ee 100644
--- a/admin/controllers/questionsanswers.php
+++ b/admin/controllers/questionsanswers.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		questionsanswers.php
diff --git a/admin/helpers/headercheck.php b/admin/helpers/headercheck.php
index 1d6cfef..bf2d2cd 100644
--- a/admin/helpers/headercheck.php
+++ b/admin/helpers/headercheck.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		headercheck.php
diff --git a/admin/helpers/html/batch_.php b/admin/helpers/html/batch_.php
index bb9512b..47e62ad 100644
--- a/admin/helpers/html/batch_.php
+++ b/admin/helpers/html/batch_.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		batch_.php
diff --git a/admin/helpers/questionsanswers.php b/admin/helpers/questionsanswers.php
index c628558..f2d69eb 100644
--- a/admin/helpers/questionsanswers.php
+++ b/admin/helpers/questionsanswers.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		questionsanswers.php
diff --git a/admin/language/en-GB/en-GB.com_questionsanswers.ini b/admin/language/en-GB/en-GB.com_questionsanswers.ini
index 40a6b3c..e457e56 100644
--- a/admin/language/en-GB/en-GB.com_questionsanswers.ini
+++ b/admin/language/en-GB/en-GB.com_questionsanswers.ini
@@ -5,6 +5,7 @@ COM_QUESTIONSANSWERS_ALLOWED_DOCUMENT_FORMATS_ARE_NOT_SET_IN_THE_GLOBAL_SETTINGS
 COM_QUESTIONSANSWERS_ALLOWED_IMAGE_FORMATS_ARE_NOT_SET_IN_THE_GLOBAL_SETTINGS_PLEASE_NOTIFY_YOUR_SYSTEM_ADMINISTRATOR="Allowed image formats are not set in the global settings, please notify your system administrator."
 COM_QUESTIONSANSWERS_ALL_IS_GOOD_PLEASE_CHECK_AGAIN_LATTER="All is good, please check again latter."
 COM_QUESTIONSANSWERS_ARCHIVED="Archived"
+COM_QUESTIONSANSWERS_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS="Are you sure you want to delete? Confirming will permanently delete the selected item(s)!"
 COM_QUESTIONSANSWERS_AUTHOR="Author"
 COM_QUESTIONSANSWERS_BACK="Back"
 COM_QUESTIONSANSWERS_CLOSE_NEW="Close & New"
@@ -86,9 +87,39 @@ COM_QUESTIONSANSWERS_EDIT_CREATED_DATE_DESC="Allows users in this group to edit
 COM_QUESTIONSANSWERS_EDIT_S="Edit %s"
 COM_QUESTIONSANSWERS_EDIT_VERSIONS="Edit Version"
 COM_QUESTIONSANSWERS_EDIT_VERSIONS_DESC="Allows users in this group to edit versions."
+COM_QUESTIONSANSWERS_EMPTY_TRASH="Empty trash"
+COM_QUESTIONSANSWERS_EXIT_TRASH="Exit trash"
 COM_QUESTIONSANSWERS_EXPORT_DATA="Export Data"
 COM_QUESTIONSANSWERS_EXPORT_DATA_DESC="Allows users in this group to export data."
 COM_QUESTIONSANSWERS_EXPORT_FAILED="Export Failed"
+COM_QUESTIONSANSWERS_FILTER_ADMIN_VIEWS_ASCENDING="Admin Views ascending"
+COM_QUESTIONSANSWERS_FILTER_ADMIN_VIEWS_DESCENDING="Admin Views descending"
+COM_QUESTIONSANSWERS_FILTER_ANSWER_ASCENDING="Answer ascending"
+COM_QUESTIONSANSWERS_FILTER_ANSWER_DESCENDING="Answer descending"
+COM_QUESTIONSANSWERS_FILTER_LOCATION_ASCENDING="Location ascending"
+COM_QUESTIONSANSWERS_FILTER_LOCATION_DESCENDING="Location descending"
+COM_QUESTIONSANSWERS_FILTER_PUBLISHED="Status"
+COM_QUESTIONSANSWERS_FILTER_PUBLISHED_HELP_DOCUMENTS="Status options for help documents"
+COM_QUESTIONSANSWERS_FILTER_PUBLISHED_QUESTIONS_AND_ANSWERS="Status options for questions and answers"
+COM_QUESTIONSANSWERS_FILTER_QUESTIONS_AND_ANSWERS_CATEGORIES_ASCENDING="Questions And Answers Categories ascending"
+COM_QUESTIONSANSWERS_FILTER_QUESTIONS_AND_ANSWERS_CATEGORIES_DESCENDING="Questions And Answers Categories descending"
+COM_QUESTIONSANSWERS_FILTER_QUESTION_ASCENDING="Question ascending"
+COM_QUESTIONSANSWERS_FILTER_QUESTION_DESCENDING="Question descending"
+COM_QUESTIONSANSWERS_FILTER_SEARCH="Searchquestions and answers"
+COM_QUESTIONSANSWERS_FILTER_SEARCH_HELP_DOCUMENTS="Search the help document items. Prefix with ID: to search for an item by ID."
+COM_QUESTIONSANSWERS_FILTER_SEARCH_QUESTIONS_AND_ANSWERS="Search the question and answer items. Prefix with ID: to search for an item by ID."
+COM_QUESTIONSANSWERS_FILTER_SELECT_ACCESS="Select Access"
+COM_QUESTIONSANSWERS_FILTER_SELECT_ADMIN_VIEWS="Select Admin Views"
+COM_QUESTIONSANSWERS_FILTER_SELECT_LOCATION="Select Location"
+COM_QUESTIONSANSWERS_FILTER_SELECT_QUESTIONS_AND_ANSWERS_CATEGORIES="Select Questions And Answers Categories"
+COM_QUESTIONSANSWERS_FILTER_SELECT_SITE_VIEWS="Select Site Views"
+COM_QUESTIONSANSWERS_FILTER_SELECT_TYPE="Select Type"
+COM_QUESTIONSANSWERS_FILTER_SITE_VIEWS_ASCENDING="Site Views ascending"
+COM_QUESTIONSANSWERS_FILTER_SITE_VIEWS_DESCENDING="Site Views descending"
+COM_QUESTIONSANSWERS_FILTER_TITLE_ASCENDING="Title ascending"
+COM_QUESTIONSANSWERS_FILTER_TITLE_DESCENDING="Title descending"
+COM_QUESTIONSANSWERS_FILTER_TYPE_ASCENDING="Type ascending"
+COM_QUESTIONSANSWERS_FILTER_TYPE_DESCENDING="Type descending"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT="Help Document"
 COM_QUESTIONSANSWERS_HELP_DOCUMENTS="Help Documents"
 COM_QUESTIONSANSWERS_HELP_DOCUMENTS_ACCESS="Help Documents Access"
@@ -137,16 +168,12 @@ COM_QUESTIONSANSWERS_HELP_DOCUMENTS_N_ITEMS_UNPUBLISHED_1="%s Help Document unpu
 COM_QUESTIONSANSWERS_HELP_DOCUMENTS_SUBMENU="Help Documents Submenu"
 COM_QUESTIONSANSWERS_HELP_DOCUMENTS_SUBMENU_DESC="Allows the users in this group to submenu of help document"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_ADMIN="Admin"
-COM_QUESTIONSANSWERS_HELP_DOCUMENT_ADMIN_VIEW="Admin View"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_ADMIN_VIEW_DESCRIPTION="Select the view being target."
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_ADMIN_VIEW_LABEL="Admin Views"
-COM_QUESTIONSANSWERS_HELP_DOCUMENT_ALIAS="Alias"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_ALIAS_HINT="Auto-generated from name"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_ALIAS_LABEL="Alias"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_ALL="All"
-COM_QUESTIONSANSWERS_HELP_DOCUMENT_ARTICLE="Article"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_ARTICLE_LABEL="Article"
-COM_QUESTIONSANSWERS_HELP_DOCUMENT_CONTENT="Content"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_CONTENT_LABEL="Content"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_CREATED_BY_DESC="The user that created this Help Document."
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_CREATED_BY_LABEL="Created By"
@@ -155,12 +182,10 @@ COM_QUESTIONSANSWERS_HELP_DOCUMENT_CREATED_DATE_LABEL="Created Date"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_DETAILS="Details"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_EDIT="Editing the Help Document"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_ERROR_UNIQUE_ALIAS="Another Help Document has the same alias."
-COM_QUESTIONSANSWERS_HELP_DOCUMENT_GROUPS="Groups"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_GROUPS_DESCRIPTION="Select a group/s"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_GROUPS_LABEL="Group/s"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_ID="Id"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_JOOMLA_ARTICLE="Joomla Article"
-COM_QUESTIONSANSWERS_HELP_DOCUMENT_LOCATION="Location"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_LOCATION_DESCRIPTION="Select the help target location."
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_LOCATION_LABEL="Location"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_MODIFIED_BY_DESC="The last user that modified this Help Document."
@@ -174,21 +199,17 @@ COM_QUESTIONSANSWERS_HELP_DOCUMENT_PUBLISHING="Publishing"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_SAVE_WARNING="Alias already existed so a number was added at the end. You can re-edit the Help Document to customise the alias."
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_SELECT_AN_OPTION="Select an option"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_SITE="Site"
-COM_QUESTIONSANSWERS_HELP_DOCUMENT_SITE_VIEW="Site View"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_SITE_VIEW_DESCRIPTION="Select the view being target."
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_SITE_VIEW_LABEL="Site Views"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_SOME="Some"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_STATUS="Status"
-COM_QUESTIONSANSWERS_HELP_DOCUMENT_TARGET="Target"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_TARGET_DESCRIPTION="Select the target option in relation to groups."
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_TARGET_LABEL="Target Groups"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_TEXT="Text"
-COM_QUESTIONSANSWERS_HELP_DOCUMENT_TITLE="Title"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_TITLE_DESCRIPTION="Enter Title Here"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_TITLE_HINT="Title Here"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_TITLE_LABEL="Title"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_TITLE_MESSAGE="Error! Please add title here."
-COM_QUESTIONSANSWERS_HELP_DOCUMENT_TYPE="Type"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_TYPE_DESCRIPTION="Select the help type."
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_TYPE_LABEL="Type"
 COM_QUESTIONSANSWERS_HELP_DOCUMENT_URL="URL"
@@ -312,7 +333,6 @@ COM_QUESTIONSANSWERS_QUESTIONS_AND_ANSWERS_N_ITEMS_UNPUBLISHED_1="%s Question an
 COM_QUESTIONSANSWERS_QUESTIONS_AND_ANSWERS_SUBMENU="Questions And Answers Submenu"
 COM_QUESTIONSANSWERS_QUESTIONS_AND_ANSWERS_SUBMENU_DESC="Allows the users in this group to submenu of question and answer"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER="Question and Answer"
-COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_ANSWER="Answer"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_ANSWER_DOCUMENTS="Answer Documents"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_ANSWER_DOCUMENTS_UPLOADER_DESCRIPTION="<div id='uikittwo-answer-documents-uploader' style='display:none'>
 	<div id='uikittwo-upload-drop-answer-documents' class='uk-placeholder uk-text-center'>
@@ -380,7 +400,6 @@ COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_NEW="A New Question and Answer"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_ORDERING_LABEL="Ordering"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_PERMISSION="Permissions"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_PUBLISHING="Publishing"
-COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTION="Question"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTIONS_AND_ANSWERS_CATEGORIES="Questions And Answers Categories"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTION_DESCRIPTION="The question being asked"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTION_HINT="Add Question Here"
@@ -392,6 +411,8 @@ COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_VERSION_LABEL="Version"
 COM_QUESTIONSANSWERS_REMOVE="Remove"
 COM_QUESTIONSANSWERS_SAVE_SUCCESS="Great! Item successfully saved."
 COM_QUESTIONSANSWERS_SAVE_WARNING="The value already existed so please select another."
+COM_QUESTIONSANSWERS_SELECT_AN_ADMIN_VIEW="Select an admin view"
+COM_QUESTIONSANSWERS_SELECT_A_SITE_VIEW="Select a site view"
 COM_QUESTIONSANSWERS_SUBMENU_DASHBOARD="Dashboard"
 COM_QUESTIONSANSWERS_SUBMENU_HELP_DOCUMENTS="Help Documents"
 COM_QUESTIONSANSWERS_SUBMENU_QUESTIONS_AND_ANSWERS="Questions and Answers"
@@ -400,6 +421,8 @@ COM_QUESTIONSANSWERS_THE_MAIN_WILL_BE_CROPPED_TO_THIS_SIZE="The main will be cro
 COM_QUESTIONSANSWERS_THE_NOTICE_BOARD_IS_LOADING="The notice board is loading"
 COM_QUESTIONSANSWERS_THE_README_IS_LOADING="The readme is loading"
 COM_QUESTIONSANSWERS_TRASHED="Trashed"
+COM_QUESTIONSANSWERS_TRASHED_ITEMS="Trashed items"
+COM_QUESTIONSANSWERS_TRASH_AREA="Trash Area"
 COM_QUESTIONSANSWERS_TYPE_HELP_DOCUMENT="Help Document"
 COM_QUESTIONSANSWERS_TYPE_QUESTION_AND_ANSWER="Question and Answer"
 COM_QUESTIONSANSWERS_USE_BATCH="Use Batch"
@@ -408,5 +431,7 @@ COM_QUESTIONSANSWERS_VERSION="Version"
 COM_QUESTIONSANSWERS_WARNING_IMPORT_FILE_ERROR="Warning, import file error."
 COM_QUESTIONSANSWERS_WARNING_IMPORT_UPLOAD_ERROR="Warning, import upload error."
 COM_QUESTIONSANSWERS_WEBSITE="Website"
+COM_QUESTIONSANSWERS_YOU_ARE_CURRENTLY_VIEWING_THE_TRASHED_ITEMS="You are currently viewing the trashed items."
+COM_QUESTIONSANSWERS_YOU_ARE_CURRENTLY_VIEWING_THE_TRASH_AREA_AND_YOU_DONT_HAVE_ANY_ITEMS_IN_TRASH_AT_THE_MOMENT="You are currently viewing the trash area, and you don't have any items in trash at the moment!"
 COM_QUESTIONSANSWERS_YOU_DO_NOT_HAVE_PERMISSION_TO_REMOVE_THIS_FILE="You do not have permission to remove this file."
 COM_QUESTIONSANSWERS_YOU_DO_NOT_HAVE_PERMISSION_TO_UPLOAD_AN="You do not have permission to upload an"
\ No newline at end of file
diff --git a/admin/layouts/batchselection.php b/admin/layouts/batchselection.php
index e48eeb2..729ef01 100644
--- a/admin/layouts/batchselection.php
+++ b/admin/layouts/batchselection.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		batchselection.php
diff --git a/admin/layouts/help_document/details_above.php b/admin/layouts/help_document/details_above.php
index 08c7afa..91b509e 100644
--- a/admin/layouts/help_document/details_above.php
+++ b/admin/layouts/help_document/details_above.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		details_above.php
diff --git a/admin/layouts/help_document/details_fullwidth.php b/admin/layouts/help_document/details_fullwidth.php
index 3632815..8994878 100644
--- a/admin/layouts/help_document/details_fullwidth.php
+++ b/admin/layouts/help_document/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/help_document/details_left.php b/admin/layouts/help_document/details_left.php
index f5a019c..922fa14 100644
--- a/admin/layouts/help_document/details_left.php
+++ b/admin/layouts/help_document/details_left.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		details_left.php
diff --git a/admin/layouts/help_document/details_right.php b/admin/layouts/help_document/details_right.php
index 12babb3..24c2376 100644
--- a/admin/layouts/help_document/details_right.php
+++ b/admin/layouts/help_document/details_right.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		details_right.php
diff --git a/admin/layouts/help_document/details_under.php b/admin/layouts/help_document/details_under.php
index b1a442f..23faa16 100644
--- a/admin/layouts/help_document/details_under.php
+++ b/admin/layouts/help_document/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		details_under.php
diff --git a/admin/layouts/help_document/publishing.php b/admin/layouts/help_document/publishing.php
index ca5359d..33dc29b 100644
--- a/admin/layouts/help_document/publishing.php
+++ b/admin/layouts/help_document/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		publishing.php
diff --git a/admin/layouts/help_document/publlshing.php b/admin/layouts/help_document/publlshing.php
index 0f1d91e..800d464 100644
--- a/admin/layouts/help_document/publlshing.php
+++ b/admin/layouts/help_document/publlshing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		publlshing.php
diff --git a/admin/layouts/question_and_answer/details_fullwidth.php b/admin/layouts/question_and_answer/details_fullwidth.php
index 92f866f..cfdc63d 100644
--- a/admin/layouts/question_and_answer/details_fullwidth.php
+++ b/admin/layouts/question_and_answer/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		details_fullwidth.php
diff --git a/admin/layouts/question_and_answer/details_rightside.php b/admin/layouts/question_and_answer/details_rightside.php
index 069540b..49294f1 100644
--- a/admin/layouts/question_and_answer/details_rightside.php
+++ b/admin/layouts/question_and_answer/details_rightside.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		details_rightside.php
diff --git a/admin/layouts/question_and_answer/details_under.php b/admin/layouts/question_and_answer/details_under.php
index 86caebc..e24207c 100644
--- a/admin/layouts/question_and_answer/details_under.php
+++ b/admin/layouts/question_and_answer/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		details_under.php
diff --git a/admin/layouts/question_and_answer/metadata.php b/admin/layouts/question_and_answer/metadata.php
index 73ea074..cadbc06 100644
--- a/admin/layouts/question_and_answer/metadata.php
+++ b/admin/layouts/question_and_answer/metadata.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		metadata.php
diff --git a/admin/layouts/question_and_answer/publishing.php b/admin/layouts/question_and_answer/publishing.php
index 7c711e3..53ce223 100644
--- a/admin/layouts/question_and_answer/publishing.php
+++ b/admin/layouts/question_and_answer/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		publishing.php
diff --git a/admin/layouts/trashhelper.php b/admin/layouts/trashhelper.php
new file mode 100644
index 0000000..d9863c7
--- /dev/null
+++ b/admin/layouts/trashhelper.php
@@ -0,0 +1,87 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |
+                                                        |_|
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		1.0.x
+	@build			8th February, 2021
+	@created		30th January, 2017
+	@package		Questions and Answers
+	@subpackage		trashhelper.php
+	@author			Llewellyn van der Merwe <https://www.vdm.io/>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+
+	Questions &amp; Answers
+
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('JPATH_BASE') or die('Restricted access');
+
+
+
+?>
+<?php if ($displayData->state->get('filter.published') == -2 && ($displayData->canState && $displayData->canDelete)) : ?>
+	<script>
+		// change the class of the delete button
+		jQuery("#toolbar-delete button").toggleClass("btn-danger");
+		// function to empty the trash
+		function emptyTrash() {
+			if (document.adminForm.boxchecked.value == 0) {
+				// select all the items visable
+				document.adminForm.elements['checkall-toggle'].checked=1;
+				Joomla.checkAll(document.adminForm.elements['checkall-toggle']);
+				// check to confirm the deletion
+				if(confirm('<?= JText::_("COM_QUESTIONSANSWERS_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS") ?>')) {
+					Joomla.submitbutton('<?= $displayData->get("name") ?>.delete');
+				} else {
+					document.adminForm.elements['checkall-toggle'].checked=0;
+					Joomla.checkAll(document.adminForm.elements['checkall-toggle']);
+				}
+			} else {
+				// confirm deletion of those selected
+				if (confirm('<?= JText::_("COM_QUESTIONSANSWERS_ARE_YOU_SURE_YOU_WANT_TO_DELETE_CONFIRMING_WILL_PERMANENTLY_DELETE_THE_SELECTED_ITEMS") ?>')) {
+					Joomla.submitbutton('<?= $displayData->get("name") ?>.delete');
+				};
+			}
+			return false;
+		}
+		// function to exit the tash state
+		function exitTrash() {
+			document.adminForm.filter_published.selectedIndex = 0;
+			document.adminForm.submit();
+			return false;
+		}
+	</script>
+	<div class="alert alert-error">
+		<?php if (empty($displayData->items)): ?>
+			<h4 class="alert-heading">
+				<span class="icon-trash"></span>
+				<?= JText::_("COM_QUESTIONSANSWERS_TRASH_AREA") ?>
+			</h4>
+			<p><?= JText::_("COM_QUESTIONSANSWERS_YOU_ARE_CURRENTLY_VIEWING_THE_TRASH_AREA_AND_YOU_DONT_HAVE_ANY_ITEMS_IN_TRASH_AT_THE_MOMENT") ?></p>
+		<?php else: ?>
+			<h4 class="alert-heading">
+				<span class="icon-trash"></span>
+				<?= JText::_("COM_QUESTIONSANSWERS_TRASHED_ITEMS") ?>
+			</h4>
+			<p><?= JText::_("COM_QUESTIONSANSWERS_YOU_ARE_CURRENTLY_VIEWING_THE_TRASHED_ITEMS") ?></p>
+			<button onclick="emptyTrash();" class="btn btn-small btn-danger">
+				<span class="icon-delete" aria-hidden="true"></span>
+				<?= JText::_("COM_QUESTIONSANSWERS_EMPTY_TRASH") ?>
+			</button>
+		<?php endif; ?>
+		<button onclick="exitTrash();" class="btn btn-small">
+			<span class="icon-back" aria-hidden="true"></span>
+			<?= JText::_("COM_QUESTIONSANSWERS_EXIT_TRASH") ?>
+		</button>
+	</div>
+<?php endif; ?>
diff --git a/admin/models/ajax.php b/admin/models/ajax.php
index a912eea..fa1ac71 100644
--- a/admin/models/ajax.php
+++ b/admin/models/ajax.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		ajax.php
diff --git a/admin/models/fields/adminviewfolderlist.php b/admin/models/fields/adminviewfolderlist.php
index 046731b..925a21a 100644
--- a/admin/models/fields/adminviewfolderlist.php
+++ b/admin/models/fields/adminviewfolderlist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		adminviewfolderlist.php
@@ -58,6 +58,10 @@ class JFormFieldAdminviewfolderlist extends JFormFieldList
 		// now check if there are files in the folder
 		if (JFolder::exists($localfolder) && $folders = JFolder::folders($localfolder))
 		{
+			if ($this->multiple === false)
+			{
+				$options[] = JHtml::_('select.option', '', JText::_('COM_QUESTIONSANSWERS_SELECT_AN_ADMIN_VIEW'));
+			}
 			foreach ($folders as $folder)
 			{
 				$options[] = JHtml::_('select.option', $folder, QuestionsanswersHelper::safeString($folder, 'W'));
diff --git a/admin/models/fields/alloweddocumentformats.php b/admin/models/fields/alloweddocumentformats.php
index c4694d6..7627e68 100644
--- a/admin/models/fields/alloweddocumentformats.php
+++ b/admin/models/fields/alloweddocumentformats.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		alloweddocumentformats.php
diff --git a/admin/models/fields/allowedimageformats.php b/admin/models/fields/allowedimageformats.php
index 4398b3e..79bcdf7 100644
--- a/admin/models/fields/allowedimageformats.php
+++ b/admin/models/fields/allowedimageformats.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		allowedimageformats.php
diff --git a/admin/models/fields/articles.php b/admin/models/fields/articles.php
index f67a9ad..89ae333 100644
--- a/admin/models/fields/articles.php
+++ b/admin/models/fields/articles.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		articles.php
diff --git a/admin/models/fields/helpdocumentsfilterlocation.php b/admin/models/fields/helpdocumentsfilterlocation.php
new file mode 100644
index 0000000..2afc7ac
--- /dev/null
+++ b/admin/models/fields/helpdocumentsfilterlocation.php
@@ -0,0 +1,85 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |
+                                                        |_|
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		1.0.x
+	@build			8th February, 2021
+	@created		30th January, 2017
+	@package		Questions and Answers
+	@subpackage		helpdocumentsfilterlocation.php
+	@author			Llewellyn van der Merwe <https://www.vdm.io/>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+
+	Questions &amp; Answers
+
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Helpdocumentsfilterlocation Form Field class for the Questionsanswers component
+ */
+class JFormFieldHelpdocumentsfilterlocation extends JFormFieldList
+{
+	/**
+	 * The helpdocumentsfilterlocation field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'helpdocumentsfilterlocation';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('location'));
+		$query->from($db->quoteName('#__questionsanswers_help_document'));
+		$query->order($db->quoteName('location') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+		$_filter = array();
+		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_QUESTIONSANSWERS_FILTER_SELECT_LOCATION') . ' -');
+
+		if ($results)
+		{
+			// get help_documentsmodel
+			$model = QuestionsanswersHelper::getModel('help_documents');
+			$results = array_unique($results);
+			foreach ($results as $location)
+			{
+				// Translate the location selection
+				$text = $model->selectionTranslation($location,'location');
+				// Now add the location and its text to the options array
+				$_filter[] = JHtml::_('select.option', $location, JText::_($text));
+			}
+		}
+		return $_filter;
+	}
+}
diff --git a/admin/models/fields/helpdocumentsfiltertype.php b/admin/models/fields/helpdocumentsfiltertype.php
new file mode 100644
index 0000000..4959608
--- /dev/null
+++ b/admin/models/fields/helpdocumentsfiltertype.php
@@ -0,0 +1,85 @@
+<?php
+/*--------------------------------------------------------------------------------------------------------|  www.vdm.io  |------/
+    __      __       _     _____                 _                                  _     __  __      _   _               _
+    \ \    / /      | |   |  __ \               | |                                | |   |  \/  |    | | | |             | |
+     \ \  / /_ _ ___| |_  | |  | | _____   _____| | ___  _ __  _ __ ___   ___ _ __ | |_  | \  / | ___| |_| |__   ___   __| |
+      \ \/ / _` / __| __| | |  | |/ _ \ \ / / _ \ |/ _ \| '_ \| '_ ` _ \ / _ \ '_ \| __| | |\/| |/ _ \ __| '_ \ / _ \ / _` |
+       \  / (_| \__ \ |_  | |__| |  __/\ V /  __/ | (_) | |_) | | | | | |  __/ | | | |_  | |  | |  __/ |_| | | | (_) | (_| |
+        \/ \__,_|___/\__| |_____/ \___| \_/ \___|_|\___/| .__/|_| |_| |_|\___|_| |_|\__| |_|  |_|\___|\__|_| |_|\___/ \__,_|
+                                                        | |
+                                                        |_|
+/-------------------------------------------------------------------------------------------------------------------------------/
+
+	@version		1.0.x
+	@build			8th February, 2021
+	@created		30th January, 2017
+	@package		Questions and Answers
+	@subpackage		helpdocumentsfiltertype.php
+	@author			Llewellyn van der Merwe <https://www.vdm.io/>
+	@copyright		Copyright (C) 2015. All Rights Reserved
+	@license		GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html
+
+	Questions &amp; Answers
+
+/-----------------------------------------------------------------------------------------------------------------------------*/
+
+// No direct access to this file
+defined('_JEXEC') or die('Restricted access');
+
+// import the list field type
+jimport('joomla.form.helper');
+JFormHelper::loadFieldClass('list');
+
+/**
+ * Helpdocumentsfiltertype Form Field class for the Questionsanswers component
+ */
+class JFormFieldHelpdocumentsfiltertype extends JFormFieldList
+{
+	/**
+	 * The helpdocumentsfiltertype field type.
+	 *
+	 * @var		string
+	 */
+	public $type = 'helpdocumentsfiltertype';
+
+	/**
+	 * Method to get a list of options for a list input.
+	 *
+	 * @return	array    An array of JHtml options.
+	 */
+	protected function getOptions()
+	{
+		// Get a db connection.
+		$db = JFactory::getDbo();
+
+		// Create a new query object.
+		$query = $db->getQuery(true);
+
+		// Select the text.
+		$query->select($db->quoteName('type'));
+		$query->from($db->quoteName('#__questionsanswers_help_document'));
+		$query->order($db->quoteName('type') . ' ASC');
+
+		// Reset the query using our newly populated query object.
+		$db->setQuery($query);
+
+		$results = $db->loadColumn();
+		$_filter = array();
+		$_filter[] = JHtml::_('select.option', '', '- ' . JText::_('COM_QUESTIONSANSWERS_FILTER_SELECT_TYPE') . ' -');
+
+		if ($results)
+		{
+			// get help_documentsmodel
+			$model = QuestionsanswersHelper::getModel('help_documents');
+			$results = array_unique($results);
+			foreach ($results as $type)
+			{
+				// Translate the type selection
+				$text = $model->selectionTranslation($type,'type');
+				// Now add the type and its text to the options array
+				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
+			}
+		}
+		return $_filter;
+	}
+}
diff --git a/admin/models/fields/siteviewfolderlist.php b/admin/models/fields/siteviewfolderlist.php
index 64a712e..8821ee5 100644
--- a/admin/models/fields/siteviewfolderlist.php
+++ b/admin/models/fields/siteviewfolderlist.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		siteviewfolderlist.php
@@ -58,6 +58,10 @@ class JFormFieldSiteviewfolderlist extends JFormFieldList
 		// now check if there are files in the folder
 		if (JFolder::exists($localfolder) && $folders = JFolder::folders($localfolder))
 		{
+			if ($this->multiple === false)
+			{
+				$options[] = JHtml::_('select.option', '', JText::_('COM_QUESTIONSANSWERS_SELECT_A_SITE_VIEW'));
+			}
 			foreach ($folders as $folder)
 			{
 				$options[] = JHtml::_('select.option', $folder, QuestionsanswersHelper::safeString($folder, 'W'));
diff --git a/admin/models/forms/filter_help_documents.xml b/admin/models/forms/filter_help_documents.xml
new file mode 100644
index 0000000..cca4ac0
--- /dev/null
+++ b/admin/models/forms/filter_help_documents.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_questionsanswers/models/rules"
+	addfieldpath="/administrator/components/com_questionsanswers/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_QUESTIONSANSWERS_FILTER_SEARCH"
+			description="COM_QUESTIONSANSWERS_FILTER_SEARCH_HELP_DOCUMENTS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_QUESTIONSANSWERS_FILTER_PUBLISHED"
+			description="COM_QUESTIONSANSWERS_FILTER_PUBLISHED_HELP_DOCUMENTS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="helpdocumentsfiltertype"
+			name="type"
+			label="COM_QUESTIONSANSWERS_HELP_DOCUMENT_TYPE_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="helpdocumentsfilterlocation"
+			name="location"
+			label="COM_QUESTIONSANSWERS_HELP_DOCUMENT_LOCATION_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="adminviewfolderlist"
+			name="admin_view"
+			label="COM_QUESTIONSANSWERS_HELP_DOCUMENT_ADMIN_VIEW_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<field
+			type="siteviewfolderlist"
+			name="site_view"
+			label="COM_QUESTIONSANSWERS_HELP_DOCUMENT_SITE_VIEW_LABEL"
+			multiple="false"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id DESC"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.title ASC">COM_QUESTIONSANSWERS_FILTER_TITLE_ASCENDING</option>
+			<option value="a.title DESC">COM_QUESTIONSANSWERS_FILTER_TITLE_DESCENDING</option>
+			<option value="a.type ASC">COM_QUESTIONSANSWERS_FILTER_TYPE_ASCENDING</option>
+			<option value="a.type DESC">COM_QUESTIONSANSWERS_FILTER_TYPE_DESCENDING</option>
+			<option value="a.location ASC">COM_QUESTIONSANSWERS_FILTER_LOCATION_ASCENDING</option>
+			<option value="a.location DESC">COM_QUESTIONSANSWERS_FILTER_LOCATION_DESCENDING</option>
+			<option value="g. ASC">COM_QUESTIONSANSWERS_FILTER_ADMIN_VIEWS_ASCENDING</option>
+			<option value="g. DESC">COM_QUESTIONSANSWERS_FILTER_ADMIN_VIEWS_DESCENDING</option>
+			<option value="h. ASC">COM_QUESTIONSANSWERS_FILTER_SITE_VIEWS_ASCENDING</option>
+			<option value="h. DESC">COM_QUESTIONSANSWERS_FILTER_SITE_VIEWS_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
\ No newline at end of file
diff --git a/admin/models/forms/filter_questions_and_answers.xml b/admin/models/forms/filter_questions_and_answers.xml
new file mode 100644
index 0000000..a91263f
--- /dev/null
+++ b/admin/models/forms/filter_questions_and_answers.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<form
+	addrulepath="/administrator/components/com_questionsanswers/models/rules"
+	addfieldpath="/administrator/components/com_questionsanswers/models/fields"
+>
+	<fields name="filter">
+		<field
+			type="text"
+			name="search"
+			inputmode="search"
+			label="COM_QUESTIONSANSWERS_FILTER_SEARCH"
+			description="COM_QUESTIONSANSWERS_FILTER_SEARCH_QUESTIONS_AND_ANSWERS"
+			hint="JSEARCH_FILTER"
+		/>
+		<field
+			type="status"
+			name="published"
+			label="COM_QUESTIONSANSWERS_FILTER_PUBLISHED"
+			description="COM_QUESTIONSANSWERS_FILTER_PUBLISHED_QUESTIONS_AND_ANSWERS"
+			onchange="this.form.submit();"
+		>
+			<option value="">JOPTION_SELECT_PUBLISHED</option>
+		</field>
+		<field
+			type="category"
+			name="category_id"
+			label="COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTIONS_AND_ANSWERS_CATEGORIES"
+			description="JOPTION_FILTER_CATEGORY_DESC"
+			multiple="true"
+			class="multipleCategories"
+			extension="com_questionsanswers.question_and_answer"
+			onchange="this.form.submit();"
+			published="0,1,2"
+		/>
+		<field
+			type="accesslevel"
+			name="access"
+			label="JFIELD_ACCESS_LABEL"
+			description="JFIELD_ACCESS_DESC"
+			multiple="true"
+			class="multipleAccessLevels"
+			onchange="this.form.submit();"
+		/>
+		<input type="hidden" name="form_submited" value="1"/>
+	</fields>
+
+	<fields name="list">
+		<field
+			name="fullordering"
+			type="list"
+			label="COM_CONTENT_LIST_FULL_ORDERING"
+			description="COM_CONTENT_LIST_FULL_ORDERING_DESC"
+			onchange="this.form.submit();"
+			default="a.id desc"
+			validate="options"
+		>
+			<option value="">JGLOBAL_SORT_BY</option>
+			<option value="a.ordering ASC">JGRID_HEADING_ORDERING_ASC</option>
+			<option value="a.ordering DESC">JGRID_HEADING_ORDERING_DESC</option>
+			<option value="a.published ASC">JSTATUS_ASC</option>
+			<option value="a.published DESC">JSTATUS_DESC</option>
+			<option value="a.question ASC">COM_QUESTIONSANSWERS_FILTER_QUESTION_ASCENDING</option>
+			<option value="a.question DESC">COM_QUESTIONSANSWERS_FILTER_QUESTION_DESCENDING</option>
+			<option value="a.answer ASC">COM_QUESTIONSANSWERS_FILTER_ANSWER_ASCENDING</option>
+			<option value="a.answer DESC">COM_QUESTIONSANSWERS_FILTER_ANSWER_DESCENDING</option>
+			<option value="category_title ASC">COM_QUESTIONSANSWERS_FILTER_QUESTIONS_AND_ANSWERS_CATEGORIES_ASCENDING</option>
+			<option value="category_title DESC">COM_QUESTIONSANSWERS_FILTER_QUESTIONS_AND_ANSWERS_CATEGORIES_DESCENDING</option>
+			<option value="a.id ASC">JGRID_HEADING_ID_ASC</option>
+			<option value="a.id DESC">JGRID_HEADING_ID_DESC</option>
+		</field>
+
+		<field
+			name="limit"
+			type="limitbox"
+			label="COM_CONTENT_LIST_LIMIT"
+			description="COM_CONTENT_LIST_LIMIT_DESC"
+			class="input-mini"
+			default="25"
+			onchange="this.form.submit();"
+		/>
+	</fields>
+</form>
\ No newline at end of file
diff --git a/admin/models/forms/help_document.js b/admin/models/forms/help_document.js
index d0279d4..59cba36 100644
--- a/admin/models/forms/help_document.js
+++ b/admin/models/forms/help_document.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		help_document.js
diff --git a/admin/models/forms/question_and_answer.js b/admin/models/forms/question_and_answer.js
index e3fc70f..b75f56e 100644
--- a/admin/models/forms/question_and_answer.js
+++ b/admin/models/forms/question_and_answer.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		question_and_answer.js
diff --git a/admin/models/help_document.php b/admin/models/help_document.php
index e21923c..2affd8d 100644
--- a/admin/models/help_document.php
+++ b/admin/models/help_document.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		help_document.php
diff --git a/admin/models/help_documents.php b/admin/models/help_documents.php
index f3d770a..a3dd273 100644
--- a/admin/models/help_documents.php
+++ b/admin/models/help_documents.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		help_documents.php
@@ -75,8 +75,15 @@ class QuestionsanswersModelHelp_documents extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
@@ -94,19 +101,39 @@ class QuestionsanswersModelHelp_documents extends JModelList
 		$this->setState('filter.search', $search);
 
 		$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
-		$this->setState('filter.type', $type);
+		if ($formSubmited)
+		{
+			$type = $app->input->post->get('type');
+			$this->setState('filter.type', $type);
+		}
 
 		$location = $this->getUserStateFromRequest($this->context . '.filter.location', 'filter_location');
-		$this->setState('filter.location', $location);
+		if ($formSubmited)
+		{
+			$location = $app->input->post->get('location');
+			$this->setState('filter.location', $location);
+		}
 
 		$admin_view = $this->getUserStateFromRequest($this->context . '.filter.admin_view', 'filter_admin_view');
-		$this->setState('filter.admin_view', $admin_view);
+		if ($formSubmited)
+		{
+			$admin_view = $app->input->post->get('admin_view');
+			$this->setState('filter.admin_view', $admin_view);
+		}
 
 		$site_view = $this->getUserStateFromRequest($this->context . '.filter.site_view', 'filter_site_view');
-		$this->setState('filter.site_view', $site_view);
+		if ($formSubmited)
+		{
+			$site_view = $app->input->post->get('site_view');
+			$this->setState('filter.site_view', $site_view);
+		}
 
 		$title = $this->getUserStateFromRequest($this->context . '.filter.title', 'filter_title');
-		$this->setState('filter.title', $title);
+		if ($formSubmited)
+		{
+			$title = $app->input->post->get('title');
+			$this->setState('filter.title', $title);
+		}
 
 		// List state information.
 		parent::populateState($ordering, $direction);
diff --git a/admin/models/import.php b/admin/models/import.php
index dc7208d..3610f38 100644
--- a/admin/models/import.php
+++ b/admin/models/import.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		import.php
diff --git a/admin/models/question_and_answer.php b/admin/models/question_and_answer.php
index 9237907..594e516 100644
--- a/admin/models/question_and_answer.php
+++ b/admin/models/question_and_answer.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		question_and_answer.php
diff --git a/admin/models/questions_and_answers.php b/admin/models/questions_and_answers.php
index 3e9ea69..01dc5ce 100644
--- a/admin/models/questions_and_answers.php
+++ b/admin/models/questions_and_answers.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		questions_and_answers.php
@@ -76,8 +76,15 @@ class QuestionsanswersModelQuestions_and_answers extends JModelList
 			$this->context .= '.' . $layout;
 		}
 
+		// Check if the form was submitted
+		$formSubmited = $app->input->post->get('form_submited');
+
 		$access = $this->getUserStateFromRequest($this->context . '.filter.access', 'filter_access', 0, 'int');
-		$this->setState('filter.access', $access);
+		if ($formSubmited)
+		{
+			$access = $app->input->post->get('access');
+			$this->setState('filter.access', $access);
+		}
 
 		$published = $this->getUserStateFromRequest($this->context . '.filter.published', 'filter_published', '');
 		$this->setState('filter.published', $published);
@@ -101,13 +108,25 @@ class QuestionsanswersModelQuestions_and_answers extends JModelList
 		$this->setState('filter.category_id', $categoryId);
 
 		$catid = $this->getUserStateFromRequest($this->context . '.filter.catid', 'filter_catid');
-		$this->setState('filter.catid', $catid);
+		if ($formSubmited)
+		{
+			$catid = $app->input->post->get('catid');
+			$this->setState('filter.catid', $catid);
+		}
 
 		$question = $this->getUserStateFromRequest($this->context . '.filter.question', 'filter_question');
-		$this->setState('filter.question', $question);
+		if ($formSubmited)
+		{
+			$question = $app->input->post->get('question');
+			$this->setState('filter.question', $question);
+		}
 
 		$answer = $this->getUserStateFromRequest($this->context . '.filter.answer', 'filter_answer');
-		$this->setState('filter.answer', $answer);
+		if ($formSubmited)
+		{
+			$answer = $app->input->post->get('answer');
+			$this->setState('filter.answer', $answer);
+		}
 
 		// List state information.
 		parent::populateState($ordering, $direction);
@@ -403,13 +422,57 @@ class QuestionsanswersModelQuestions_and_answers extends JModelList
 		$id .= ':' . $this->getState('filter.id');
 		$id .= ':' . $this->getState('filter.search');
 		$id .= ':' . $this->getState('filter.published');
-		$id .= ':' . $this->getState('filter.access');
+		// Check if the value is an array
+		$_access = $this->getState('filter.access');
+		if (QuestionsanswersHelper::checkArray($_access))
+		{
+			$id .= ':' . implode(':', $_access);
+		}
+		// Check if this is only an number or string
+		elseif (is_numeric($_access)
+		 || QuestionsanswersHelper::checkString($_access))
+		{
+			$id .= ':' . $_access;
+		}
 		$id .= ':' . $this->getState('filter.ordering');
 		$id .= ':' . $this->getState('filter.created_by');
 		$id .= ':' . $this->getState('filter.modified_by');
-		$id .= ':' . $this->getState('filter.category');
-		$id .= ':' . $this->getState('filter.category_id');
-		$id .= ':' . $this->getState('filter.catid');
+		// Check if the value is an array
+		$_category = $this->getState('filter.category');
+		if (QuestionsanswersHelper::checkArray($_category))
+		{
+			$id .= ':' . implode(':', $_category);
+		}
+		// Check if this is only an number or string
+		elseif (is_numeric($_category)
+		 || QuestionsanswersHelper::checkString($_category))
+		{
+			$id .= ':' . $_category;
+		}
+		// Check if the value is an array
+		$_category_id = $this->getState('filter.category_id');
+		if (QuestionsanswersHelper::checkArray($_category_id))
+		{
+			$id .= ':' . implode(':', $_category_id);
+		}
+		// Check if this is only an number or string
+		elseif (is_numeric($_category_id)
+		 || QuestionsanswersHelper::checkString($_category_id))
+		{
+			$id .= ':' . $_category_id;
+		}
+		// Check if the value is an array
+		$_catid = $this->getState('filter.catid');
+		if (QuestionsanswersHelper::checkArray($_catid))
+		{
+			$id .= ':' . implode(':', $_catid);
+		}
+		// Check if this is only an number or string
+		elseif (is_numeric($_catid)
+		 || QuestionsanswersHelper::checkString($_catid))
+		{
+			$id .= ':' . $_catid;
+		}
 		$id .= ':' . $this->getState('filter.question');
 		$id .= ':' . $this->getState('filter.answer');
 
diff --git a/admin/models/questionsanswers.php b/admin/models/questionsanswers.php
index cac0bee..eacc2cd 100644
--- a/admin/models/questionsanswers.php
+++ b/admin/models/questionsanswers.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		questionsanswers.php
diff --git a/admin/questionsanswers.php b/admin/questionsanswers.php
index fee6f8b..849f4c3 100644
--- a/admin/questionsanswers.php
+++ b/admin/questionsanswers.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		questionsanswers.php
diff --git a/admin/tables/help_document.php b/admin/tables/help_document.php
index 543f6de..9694115 100644
--- a/admin/tables/help_document.php
+++ b/admin/tables/help_document.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		help_document.php
diff --git a/admin/tables/question_and_answer.php b/admin/tables/question_and_answer.php
index ccc1d3b..16d4b12 100644
--- a/admin/tables/question_and_answer.php
+++ b/admin/tables/question_and_answer.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		question_and_answer.php
diff --git a/admin/views/help_document/submitbutton.js b/admin/views/help_document/submitbutton.js
index be57b92..4692868 100644
--- a/admin/views/help_document/submitbutton.js
+++ b/admin/views/help_document/submitbutton.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		submitbutton.js
diff --git a/admin/views/help_document/tmpl/edit.php b/admin/views/help_document/tmpl/edit.php
index dc90e43..a208c2a 100644
--- a/admin/views/help_document/tmpl/edit.php
+++ b/admin/views/help_document/tmpl/edit.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		edit.php
diff --git a/admin/views/help_document/view.html.php b/admin/views/help_document/view.html.php
index 9cb00b3..fcc81d7 100644
--- a/admin/views/help_document/view.html.php
+++ b/admin/views/help_document/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		view.html.php
diff --git a/admin/views/help_documents/tmpl/default.php b/admin/views/help_documents/tmpl/default.php
index b398983..4b72a42 100644
--- a/admin/views/help_documents/tmpl/default.php
+++ b/admin/views/help_documents/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default.php
@@ -36,23 +36,6 @@ if ($this->saveOrder)
 	JHtml::_('sortablelist.sortable', 'help_documentList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
 <form action="<?php echo JRoute::_('index.php?option=com_questionsanswers&view=help_documents'); ?>" method="post" name="adminForm" id="adminForm">
 <?php if(!empty( $this->sidebar)): ?>
 	<div id="j-sidebar-container" class="span2">
@@ -62,13 +45,17 @@ if ($this->saveOrder)
 <?php else : ?>
 	<div id="j-main-container">
 <?php endif; ?>
+<?php
+	// Add the trash helper layout
+	echo JLayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
 <?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
 	<div class="alert alert-no-items">
 		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 	</div>
 <?php else : ?>
-	<?php echo $this->loadTemplate('toolbar');?>
 	<table class="table table-striped" id="help_documentList">
 		<thead><?php echo $this->loadTemplate('head');?></thead>
 		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
@@ -86,8 +73,6 @@ if ($this->saveOrder)
 			$this->loadTemplate('batch_body')
 		); ?>
 	<?php endif; ?>
-	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
 	<input type="hidden" name="boxchecked" value="0" />
 	</div>
 <?php endif; ?>
diff --git a/admin/views/help_documents/tmpl/default_batch_body.php b/admin/views/help_documents/tmpl/default_batch_body.php
index 28262ac..763abea 100644
--- a/admin/views/help_documents/tmpl/default_batch_body.php
+++ b/admin/views/help_documents/tmpl/default_batch_body.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_batch_body.php
diff --git a/admin/views/help_documents/tmpl/default_batch_footer.php b/admin/views/help_documents/tmpl/default_batch_footer.php
index 1b6e0ec..a57838f 100644
--- a/admin/views/help_documents/tmpl/default_batch_footer.php
+++ b/admin/views/help_documents/tmpl/default_batch_footer.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/help_documents/tmpl/default_body.php b/admin/views/help_documents/tmpl/default_body.php
index 02cb2e5..97fd778 100644
--- a/admin/views/help_documents/tmpl/default_body.php
+++ b/admin/views/help_documents/tmpl/default_body.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_body.php
diff --git a/admin/views/help_documents/tmpl/default_foot.php b/admin/views/help_documents/tmpl/default_foot.php
index 0666b48..617fcf3 100644
--- a/admin/views/help_documents/tmpl/default_foot.php
+++ b/admin/views/help_documents/tmpl/default_foot.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_foot.php
diff --git a/admin/views/help_documents/tmpl/default_head.php b/admin/views/help_documents/tmpl/default_head.php
index 25917ef..cba6ac6 100644
--- a/admin/views/help_documents/tmpl/default_head.php
+++ b/admin/views/help_documents/tmpl/default_head.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_head.php
@@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>
@@ -44,26 +44,26 @@ defined('_JEXEC') or die('Restricted access');
 		</th>
 	<?php endif; ?>
 	<th class="nowrap" >
-			<?php echo JHtml::_('grid.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_TITLE_LABEL', 'a.title', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_TITLE_LABEL', 'a.title', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo JHtml::_('grid.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_TYPE_LABEL', 'a.type', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_TYPE_LABEL', 'a.type', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
 			<?php echo JText::_('COM_QUESTIONSANSWERS_HELP_DOCUMENT_GROUPS_LABEL'); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo JHtml::_('grid.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_LOCATION_LABEL', 'a.location', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_LOCATION_LABEL', 'a.location', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo JHtml::_('grid.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_ADMIN_VIEW_LABEL', 'g.', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_ADMIN_VIEW_LABEL', 'g.', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo JHtml::_('grid.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_SITE_VIEW_LABEL', 'h.', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_SITE_VIEW_LABEL', 'h.', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<?php if ($this->canState): ?>
 		<th width="10" class="nowrap center" >
-			<?php echo JHtml::_('grid.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_STATUS', 'a.published', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_STATUS', 'a.published', $this->listDirn, $this->listOrder); ?>
 		</th>
 	<?php else: ?>
 		<th width="10" class="nowrap center" >
@@ -71,6 +71,6 @@ defined('_JEXEC') or die('Restricted access');
 		</th>
 	<?php endif; ?>
 	<th width="5" class="nowrap center hidden-phone" >
-			<?php echo JHtml::_('grid.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_ID', 'a.id', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_QUESTIONSANSWERS_HELP_DOCUMENT_ID', 'a.id', $this->listDirn, $this->listOrder); ?>
 	</th>
 </tr>
\ No newline at end of file
diff --git a/admin/views/help_documents/tmpl/default_toolbar.php b/admin/views/help_documents/tmpl/default_toolbar.php
index 95acce9..a427107 100644
--- a/admin/views/help_documents/tmpl/default_toolbar.php
+++ b/admin/views/help_documents/tmpl/default_toolbar.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_toolbar.php
diff --git a/admin/views/help_documents/view.html.php b/admin/views/help_documents/view.html.php
index 7b8214f..13a9990 100644
--- a/admin/views/help_documents/view.html.php
+++ b/admin/views/help_documents/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		view.html.php
@@ -48,6 +48,10 @@ class QuestionsanswersViewHelp_documents extends JViewLegacy
 		$this->pagination = $this->get('Pagination');
 		$this->state = $this->get('State');
 		$this->user = JFactory::getUser();
+		// Load the filter form from xml.
+		$this->filterForm = $this->get('FilterForm');
+		// Load the active filters.
+		$this->activeFilters = $this->get('ActiveFilters');
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'DESC'));
@@ -168,96 +172,6 @@ class QuestionsanswersViewHelp_documents extends JViewLegacy
 			JToolBarHelper::preferences('com_questionsanswers');
 		}
 
-		// Only load publish filter if state change is allowed
-		if ($this->canState)
-		{
-			JHtmlSidebar::addFilter(
-				JText::_('JOPTION_SELECT_PUBLISHED'),
-				'filter_published',
-				JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true)
-			);
-		}
-
-		// Set Type Selection
-		$this->typeOptions = $this->getTheTypeSelections();
-		// We do some sanitation for Type filter
-		if (QuestionsanswersHelper::checkArray($this->typeOptions) &&
-			isset($this->typeOptions[0]->value) &&
-			!QuestionsanswersHelper::checkString($this->typeOptions[0]->value))
-		{
-			unset($this->typeOptions[0]);
-		}
-		// Only load Type filter if it has values
-		if (QuestionsanswersHelper::checkArray($this->typeOptions))
-		{
-			// Type Filter
-			JHtmlSidebar::addFilter(
-				'- Select '.JText::_('COM_QUESTIONSANSWERS_HELP_DOCUMENT_TYPE_LABEL').' -',
-				'filter_type',
-				JHtml::_('select.options', $this->typeOptions, 'value', 'text', $this->state->get('filter.type'))
-			);
-		}
-
-		// Set Location Selection
-		$this->locationOptions = $this->getTheLocationSelections();
-		// We do some sanitation for Location filter
-		if (QuestionsanswersHelper::checkArray($this->locationOptions) &&
-			isset($this->locationOptions[0]->value) &&
-			!QuestionsanswersHelper::checkString($this->locationOptions[0]->value))
-		{
-			unset($this->locationOptions[0]);
-		}
-		// Only load Location filter if it has values
-		if (QuestionsanswersHelper::checkArray($this->locationOptions))
-		{
-			// Location Filter
-			JHtmlSidebar::addFilter(
-				'- Select '.JText::_('COM_QUESTIONSANSWERS_HELP_DOCUMENT_LOCATION_LABEL').' -',
-				'filter_location',
-				JHtml::_('select.options', $this->locationOptions, 'value', 'text', $this->state->get('filter.location'))
-			);
-		}
-
-		// Set Admin View Selection
-		$this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->options;
-		// We do some sanitation for Admin View filter
-		if (QuestionsanswersHelper::checkArray($this->admin_viewOptions) &&
-			isset($this->admin_viewOptions[0]->value) &&
-			!QuestionsanswersHelper::checkString($this->admin_viewOptions[0]->value))
-		{
-			unset($this->admin_viewOptions[0]);
-		}
-		// Only load Admin View filter if it has values
-		if (QuestionsanswersHelper::checkArray($this->admin_viewOptions))
-		{
-			// Admin View Filter
-			JHtmlSidebar::addFilter(
-				'- Select ' . JText::_('COM_QUESTIONSANSWERS_HELP_DOCUMENT_ADMIN_VIEW_LABEL') . ' -',
-				'filter_admin_view',
-				JHtml::_('select.options', $this->admin_viewOptions, 'value', 'text', $this->state->get('filter.admin_view'))
-			);
-		}
-
-		// Set Site View Selection
-		$this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->options;
-		// We do some sanitation for Site View filter
-		if (QuestionsanswersHelper::checkArray($this->site_viewOptions) &&
-			isset($this->site_viewOptions[0]->value) &&
-			!QuestionsanswersHelper::checkString($this->site_viewOptions[0]->value))
-		{
-			unset($this->site_viewOptions[0]);
-		}
-		// Only load Site View filter if it has values
-		if (QuestionsanswersHelper::checkArray($this->site_viewOptions))
-		{
-			// Site View Filter
-			JHtmlSidebar::addFilter(
-				'- Select ' . JText::_('COM_QUESTIONSANSWERS_HELP_DOCUMENT_SITE_VIEW_LABEL') . ' -',
-				'filter_site_view',
-				JHtml::_('select.options', $this->site_viewOptions, 'value', 'text', $this->state->get('filter.site_view'))
-			);
-		}
-
 		// Only load published batch if state and batch is allowed
 		if ($this->canState && $this->canBatch)
 		{
@@ -271,6 +185,15 @@ class QuestionsanswersViewHelp_documents extends JViewLegacy
 		// Only load Type batch if create, edit, and batch is allowed
 		if ($this->canBatch && $this->canCreate && $this->canEdit)
 		{
+			// Set Type Selection
+			$this->typeOptions = JFormHelper::loadFieldType('helpdocumentsfiltertype')->options;
+			// We do some sanitation for Type filter
+			if (QuestionsanswersHelper::checkArray($this->typeOptions) &&
+				isset($this->typeOptions[0]->value) &&
+				!QuestionsanswersHelper::checkString($this->typeOptions[0]->value))
+			{
+				unset($this->typeOptions[0]);
+			}
 			// Type Batch Selection
 			JHtmlBatch_::addListSelection(
 				'- Keep Original '.JText::_('COM_QUESTIONSANSWERS_HELP_DOCUMENT_TYPE_LABEL').' -',
@@ -282,6 +205,15 @@ class QuestionsanswersViewHelp_documents extends JViewLegacy
 		// Only load Location batch if create, edit, and batch is allowed
 		if ($this->canBatch && $this->canCreate && $this->canEdit)
 		{
+			// Set Location Selection
+			$this->locationOptions = JFormHelper::loadFieldType('helpdocumentsfilterlocation')->options;
+			// We do some sanitation for Location filter
+			if (QuestionsanswersHelper::checkArray($this->locationOptions) &&
+				isset($this->locationOptions[0]->value) &&
+				!QuestionsanswersHelper::checkString($this->locationOptions[0]->value))
+			{
+				unset($this->locationOptions[0]);
+			}
 			// Location Batch Selection
 			JHtmlBatch_::addListSelection(
 				'- Keep Original '.JText::_('COM_QUESTIONSANSWERS_HELP_DOCUMENT_LOCATION_LABEL').' -',
@@ -293,6 +225,15 @@ class QuestionsanswersViewHelp_documents extends JViewLegacy
 		// Only load Admin View batch if create, edit, and batch is allowed
 		if ($this->canBatch && $this->canCreate && $this->canEdit)
 		{
+			// Set Admin View Selection
+			$this->admin_viewOptions = JFormHelper::loadFieldType('Adminviewfolderlist')->options;
+			// We do some sanitation for Admin View filter
+			if (QuestionsanswersHelper::checkArray($this->admin_viewOptions) &&
+				isset($this->admin_viewOptions[0]->value) &&
+				!QuestionsanswersHelper::checkString($this->admin_viewOptions[0]->value))
+			{
+				unset($this->admin_viewOptions[0]);
+			}
 			// Admin View Batch Selection
 			JHtmlBatch_::addListSelection(
 				'- Keep Original '.JText::_('COM_QUESTIONSANSWERS_HELP_DOCUMENT_ADMIN_VIEW_LABEL').' -',
@@ -304,6 +245,15 @@ class QuestionsanswersViewHelp_documents extends JViewLegacy
 		// Only load Site View batch if create, edit, and batch is allowed
 		if ($this->canBatch && $this->canCreate && $this->canEdit)
 		{
+			// Set Site View Selection
+			$this->site_viewOptions = JFormHelper::loadFieldType('Siteviewfolderlist')->options;
+			// We do some sanitation for Site View filter
+			if (QuestionsanswersHelper::checkArray($this->site_viewOptions) &&
+				isset($this->site_viewOptions[0]->value) &&
+				!QuestionsanswersHelper::checkString($this->site_viewOptions[0]->value))
+			{
+				unset($this->site_viewOptions[0]);
+			}
 			// Site View Batch Selection
 			JHtmlBatch_::addListSelection(
 				'- Keep Original '.JText::_('COM_QUESTIONSANSWERS_HELP_DOCUMENT_SITE_VIEW_LABEL').' -',
@@ -363,75 +313,5 @@ class QuestionsanswersViewHelp_documents extends JViewLegacy
 			'h.' => JText::_('COM_QUESTIONSANSWERS_HELP_DOCUMENT_SITE_VIEW_LABEL'),
 			'a.id' => JText::_('JGRID_HEADING_ID')
 		);
-	}
-
-	protected function getTheTypeSelections()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-
-		// Create a new query object.
-		$query = $db->getQuery(true);
-
-		// Select the text.
-		$query->select($db->quoteName('type'));
-		$query->from($db->quoteName('#__questionsanswers_help_document'));
-		$query->order($db->quoteName('type') . ' ASC');
-
-		// Reset the query using our newly populated query object.
-		$db->setQuery($query);
-
-		$results = $db->loadColumn();
-		$_filter = array();
-
-		if ($results)
-		{
-			// get model
-			$model = $this->getModel();
-			$results = array_unique($results);
-			foreach ($results as $type)
-			{
-				// Translate the type selection
-				$text = $model->selectionTranslation($type,'type');
-				// Now add the type and its text to the options array
-				$_filter[] = JHtml::_('select.option', $type, JText::_($text));
-			}
-		}
-		return $_filter;
-	}
-
-	protected function getTheLocationSelections()
-	{
-		// Get a db connection.
-		$db = JFactory::getDbo();
-
-		// Create a new query object.
-		$query = $db->getQuery(true);
-
-		// Select the text.
-		$query->select($db->quoteName('location'));
-		$query->from($db->quoteName('#__questionsanswers_help_document'));
-		$query->order($db->quoteName('location') . ' ASC');
-
-		// Reset the query using our newly populated query object.
-		$db->setQuery($query);
-
-		$results = $db->loadColumn();
-		$_filter = array();
-
-		if ($results)
-		{
-			// get model
-			$model = $this->getModel();
-			$results = array_unique($results);
-			foreach ($results as $location)
-			{
-				// Translate the location selection
-				$text = $model->selectionTranslation($location,'location');
-				// Now add the location and its text to the options array
-				$_filter[] = JHtml::_('select.option', $location, JText::_($text));
-			}
-		}
-		return $_filter;
 	}
 }
diff --git a/admin/views/import/tmpl/default.php b/admin/views/import/tmpl/default.php
index a423a80..04bd025 100644
--- a/admin/views/import/tmpl/default.php
+++ b/admin/views/import/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default.php
diff --git a/admin/views/import/view.html.php b/admin/views/import/view.html.php
index 42a2dd8..fe347b1 100644
--- a/admin/views/import/view.html.php
+++ b/admin/views/import/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		view.html.php
diff --git a/admin/views/question_and_answer/submitbutton.js b/admin/views/question_and_answer/submitbutton.js
index 14c1071..09c6768 100644
--- a/admin/views/question_and_answer/submitbutton.js
+++ b/admin/views/question_and_answer/submitbutton.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		submitbutton.js
diff --git a/admin/views/question_and_answer/tmpl/edit.php b/admin/views/question_and_answer/tmpl/edit.php
index c61cc3b..9682daa 100644
--- a/admin/views/question_and_answer/tmpl/edit.php
+++ b/admin/views/question_and_answer/tmpl/edit.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		edit.php
diff --git a/admin/views/question_and_answer/view.html.php b/admin/views/question_and_answer/view.html.php
index 7b29e1e..5f0e181 100644
--- a/admin/views/question_and_answer/view.html.php
+++ b/admin/views/question_and_answer/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		view.html.php
diff --git a/admin/views/questions_and_answers/tmpl/default.php b/admin/views/questions_and_answers/tmpl/default.php
index 0d6dcf7..1e17ee5 100644
--- a/admin/views/questions_and_answers/tmpl/default.php
+++ b/admin/views/questions_and_answers/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default.php
@@ -29,6 +29,8 @@ defined('_JEXEC') or die('Restricted access');
 JHtml::_('behavior.tooltip');
 JHtml::_('behavior.multiselect');
 JHtml::_('dropdown.init');
+JHtml::_('formbehavior.chosen', '.multipleCategories', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_QUESTIONSANSWERS_FILTER_SELECT_QUESTIONS_AND_ANSWERS_CATEGORIES') . ' -'));
+JHtml::_('formbehavior.chosen', '.multipleAccessLevels', null, array('placeholder_text_multiple' => '- ' . JText::_('COM_QUESTIONSANSWERS_FILTER_SELECT_ACCESS') . ' -'));
 JHtml::_('formbehavior.chosen', 'select');
 if ($this->saveOrder)
 {
@@ -36,23 +38,6 @@ if ($this->saveOrder)
 	JHtml::_('sortablelist.sortable', 'question_and_answerList', 'adminForm', strtolower($this->listDirn), $saveOrderingUrl);
 }
 ?>
-<script type="text/javascript">
-	Joomla.orderTable = function()
-	{
-		table = document.getElementById("sortTable");
-		direction = document.getElementById("directionTable");
-		order = table.options[table.selectedIndex].value;
-		if (order != '<?php echo $this->listOrder; ?>')
-		{
-			dirn = 'asc';
-		}
-		else
-		{
-			dirn = direction.options[direction.selectedIndex].value;
-		}
-		Joomla.tableOrdering(order, dirn, '');
-	}
-</script>
 <form action="<?php echo JRoute::_('index.php?option=com_questionsanswers&view=questions_and_answers'); ?>" method="post" name="adminForm" id="adminForm">
 <?php if(!empty( $this->sidebar)): ?>
 	<div id="j-sidebar-container" class="span2">
@@ -62,13 +47,17 @@ if ($this->saveOrder)
 <?php else : ?>
 	<div id="j-main-container">
 <?php endif; ?>
+<?php
+	// Add the trash helper layout
+	echo JLayoutHelper::render('trashhelper', $this);
+	// Add the searchtools
+	echo JLayoutHelper::render('joomla.searchtools.default', array('view' => $this));
+?>
 <?php if (empty($this->items)): ?>
-	<?php echo $this->loadTemplate('toolbar');?>
 	<div class="alert alert-no-items">
 		<?php echo JText::_('JGLOBAL_NO_MATCHING_RESULTS'); ?>
 	</div>
 <?php else : ?>
-	<?php echo $this->loadTemplate('toolbar');?>
 	<table class="table table-striped" id="question_and_answerList">
 		<thead><?php echo $this->loadTemplate('head');?></thead>
 		<tfoot><?php echo $this->loadTemplate('foot');?></tfoot>
@@ -86,8 +75,6 @@ if ($this->saveOrder)
 			$this->loadTemplate('batch_body')
 		); ?>
 	<?php endif; ?>
-	<input type="hidden" name="filter_order" value="<?php echo $this->listOrder; ?>" />
-	<input type="hidden" name="filter_order_Dir" value="<?php echo $this->listDirn; ?>" />
 	<input type="hidden" name="boxchecked" value="0" />
 	</div>
 <?php endif; ?>
diff --git a/admin/views/questions_and_answers/tmpl/default_batch_body.php b/admin/views/questions_and_answers/tmpl/default_batch_body.php
index b279a2b..e4d7c2c 100644
--- a/admin/views/questions_and_answers/tmpl/default_batch_body.php
+++ b/admin/views/questions_and_answers/tmpl/default_batch_body.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_batch_body.php
diff --git a/admin/views/questions_and_answers/tmpl/default_batch_footer.php b/admin/views/questions_and_answers/tmpl/default_batch_footer.php
index 5500650..ed99a55 100644
--- a/admin/views/questions_and_answers/tmpl/default_batch_footer.php
+++ b/admin/views/questions_and_answers/tmpl/default_batch_footer.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_batch_footer.php
diff --git a/admin/views/questions_and_answers/tmpl/default_body.php b/admin/views/questions_and_answers/tmpl/default_body.php
index 4bb2784..5d90ef7 100644
--- a/admin/views/questions_and_answers/tmpl/default_body.php
+++ b/admin/views/questions_and_answers/tmpl/default_body.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_body.php
diff --git a/admin/views/questions_and_answers/tmpl/default_foot.php b/admin/views/questions_and_answers/tmpl/default_foot.php
index f85d564..ea0a9be 100644
--- a/admin/views/questions_and_answers/tmpl/default_foot.php
+++ b/admin/views/questions_and_answers/tmpl/default_foot.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_foot.php
diff --git a/admin/views/questions_and_answers/tmpl/default_head.php b/admin/views/questions_and_answers/tmpl/default_head.php
index 82075ce..e064159 100644
--- a/admin/views/questions_and_answers/tmpl/default_head.php
+++ b/admin/views/questions_and_answers/tmpl/default_head.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_head.php
@@ -30,7 +30,7 @@ defined('_JEXEC') or die('Restricted access');
 <tr>
 	<?php if ($this->canEdit&& $this->canState): ?>
 		<th width="1%" class="nowrap center hidden-phone">
-			<?php echo JHtml::_('grid.sort', '<i class="icon-menu-2"></i>', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING'); ?>
+			<?php echo JHtml::_('searchtools.sort', '', 'a.ordering', $this->listDirn, $this->listOrder, null, 'asc', 'JGRID_HEADING_ORDERING', 'icon-menu-2'); ?>
 		</th>
 		<th width="20" class="nowrap center">
 			<?php echo JHtml::_('grid.checkall'); ?>
@@ -44,17 +44,17 @@ defined('_JEXEC') or die('Restricted access');
 		</th>
 	<?php endif; ?>
 	<th class="nowrap" >
-			<?php echo JHtml::_('grid.sort', 'COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTION_LABEL', 'a.question', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTION_LABEL', 'a.question', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap hidden-phone" >
-			<?php echo JHtml::_('grid.sort', 'COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_ANSWER_LABEL', 'a.answer', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_ANSWER_LABEL', 'a.answer', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<th class="nowrap" >
-			<?php echo JHtml::_('grid.sort', 'COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTIONS_AND_ANSWERS_CATEGORIES', 'category_title', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTIONS_AND_ANSWERS_CATEGORIES', 'category_title', $this->listDirn, $this->listOrder); ?>
 	</th>
 	<?php if ($this->canState): ?>
 		<th width="10" class="nowrap center" >
-			<?php echo JHtml::_('grid.sort', 'COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_STATUS', 'a.published', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_STATUS', 'a.published', $this->listDirn, $this->listOrder); ?>
 		</th>
 	<?php else: ?>
 		<th width="10" class="nowrap center" >
@@ -62,6 +62,6 @@ defined('_JEXEC') or die('Restricted access');
 		</th>
 	<?php endif; ?>
 	<th width="5" class="nowrap center hidden-phone" >
-			<?php echo JHtml::_('grid.sort', 'COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_ID', 'a.id', $this->listDirn, $this->listOrder); ?>
+			<?php echo JHtml::_('searchtools.sort', 'COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_ID', 'a.id', $this->listDirn, $this->listOrder); ?>
 	</th>
 </tr>
\ No newline at end of file
diff --git a/admin/views/questions_and_answers/tmpl/default_toolbar.php b/admin/views/questions_and_answers/tmpl/default_toolbar.php
index cd066df..5837cf0 100644
--- a/admin/views/questions_and_answers/tmpl/default_toolbar.php
+++ b/admin/views/questions_and_answers/tmpl/default_toolbar.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_toolbar.php
diff --git a/admin/views/questions_and_answers/view.html.php b/admin/views/questions_and_answers/view.html.php
index 9272616..9cdc280 100644
--- a/admin/views/questions_and_answers/view.html.php
+++ b/admin/views/questions_and_answers/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		view.html.php
@@ -48,6 +48,10 @@ class QuestionsanswersViewQuestions_and_answers extends JViewLegacy
 		$this->pagination = $this->get('Pagination');
 		$this->state = $this->get('State');
 		$this->user = JFactory::getUser();
+		// Load the filter form from xml.
+		$this->filterForm = $this->get('FilterForm');
+		// Load the active filters.
+		$this->activeFilters = $this->get('ActiveFilters');
 		// Add the list ordering clause.
 		$this->listOrder = $this->escape($this->state->get('list.ordering', 'a.id'));
 		$this->listDirn = $this->escape($this->state->get('list.direction', 'desc'));
@@ -168,29 +172,6 @@ class QuestionsanswersViewQuestions_and_answers extends JViewLegacy
 			JToolBarHelper::preferences('com_questionsanswers');
 		}
 
-		// Only load publish filter if state change is allowed
-		if ($this->canState)
-		{
-			JHtmlSidebar::addFilter(
-				JText::_('JOPTION_SELECT_PUBLISHED'),
-				'filter_published',
-				JHtml::_('select.options', JHtml::_('jgrid.publishedOptions'), 'value', 'text', $this->state->get('filter.published'), true)
-			);
-		}
-
-		JHtmlSidebar::addFilter(
-			JText::_('JOPTION_SELECT_ACCESS'),
-			'filter_access',
-			JHtml::_('select.options', JHtml::_('access.assetgroups'), 'value', 'text', $this->state->get('filter.access'))
-		);
-
-		// Category Filter.
-		JHtmlSidebar::addFilter(
-			JText::_('JOPTION_SELECT_CATEGORY'),
-			'filter_category_id',
-			JHtml::_('select.options', JHtml::_('category.options', 'com_questionsanswers.question_and_answer'), 'value', 'text', $this->state->get('filter.category_id'))
-		);
-
 		// Only load published batch if state and batch is allowed
 		if ($this->canState && $this->canBatch)
 		{
diff --git a/admin/views/questionsanswers/tmpl/default.php b/admin/views/questionsanswers/tmpl/default.php
index ce1ac4c..85564dd 100644
--- a/admin/views/questionsanswers/tmpl/default.php
+++ b/admin/views/questionsanswers/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default.php
diff --git a/admin/views/questionsanswers/tmpl/default_main.php b/admin/views/questionsanswers/tmpl/default_main.php
index 01d8818..33ed4c3 100644
--- a/admin/views/questionsanswers/tmpl/default_main.php
+++ b/admin/views/questionsanswers/tmpl/default_main.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_main.php
diff --git a/admin/views/questionsanswers/tmpl/default_readme_information.php b/admin/views/questionsanswers/tmpl/default_readme_information.php
index 5922943..5df0d12 100644
--- a/admin/views/questionsanswers/tmpl/default_readme_information.php
+++ b/admin/views/questionsanswers/tmpl/default_readme_information.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_readme_information.php
diff --git a/admin/views/questionsanswers/tmpl/default_vast_development_method_notice_board.php b/admin/views/questionsanswers/tmpl/default_vast_development_method_notice_board.php
index 8a6896e..e9da184 100644
--- a/admin/views/questionsanswers/tmpl/default_vast_development_method_notice_board.php
+++ b/admin/views/questionsanswers/tmpl/default_vast_development_method_notice_board.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_vast_development_method_notice_board.php
diff --git a/admin/views/questionsanswers/tmpl/default_vdm.php b/admin/views/questionsanswers/tmpl/default_vdm.php
index de64a4a..ff6380d 100644
--- a/admin/views/questionsanswers/tmpl/default_vdm.php
+++ b/admin/views/questionsanswers/tmpl/default_vdm.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_vdm.php
diff --git a/admin/views/questionsanswers/view.html.php b/admin/views/questionsanswers/view.html.php
index 3b36eb0..7853d7b 100644
--- a/admin/views/questionsanswers/view.html.php
+++ b/admin/views/questionsanswers/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		view.html.php
diff --git a/media/css/A4.print.css b/media/css/A4.print.css
index 0492819..02d1cac 100644
--- a/media/css/A4.print.css
+++ b/media/css/A4.print.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		A4.print.css
diff --git a/questionsanswers.xml b/questionsanswers.xml
index 76a1d76..298a49e 100644
--- a/questionsanswers.xml
+++ b/questionsanswers.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2" method="upgrade">
 	<name>COM_QUESTIONSANSWERS</name>
-	<creationDate>6th January, 2021</creationDate>
+	<creationDate>8th February, 2021</creationDate>
 	<author>Llewellyn van der Merwe</author>
 	<authorEmail>joomla@vdm.io</authorEmail>
 	<authorUrl>https://www.vdm.io/</authorUrl>
diff --git a/script.php b/script.php
index 5128da1..9d83962 100644
--- a/script.php
+++ b/script.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		script.php
diff --git a/site/assets/css/category.css b/site/assets/css/category.css
index 3006b3e..fea8122 100644
--- a/site/assets/css/category.css
+++ b/site/assets/css/category.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		category.css
diff --git a/site/assets/css/downloads.css b/site/assets/css/downloads.css
index b48f176..2224cec 100644
--- a/site/assets/css/downloads.css
+++ b/site/assets/css/downloads.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		downloads.css
diff --git a/site/assets/css/question_and_answer.css b/site/assets/css/question_and_answer.css
index d1a392b..3919a31 100644
--- a/site/assets/css/question_and_answer.css
+++ b/site/assets/css/question_and_answer.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		question_and_answer.css
diff --git a/site/assets/css/questions_and_answers.css b/site/assets/css/questions_and_answers.css
index 5498c75..3a822b4 100644
--- a/site/assets/css/questions_and_answers.css
+++ b/site/assets/css/questions_and_answers.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		questions_and_answers.css
diff --git a/site/assets/css/site.css b/site/assets/css/site.css
index c48fdfc..7c292c0 100644
--- a/site/assets/css/site.css
+++ b/site/assets/css/site.css
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		site.css
diff --git a/site/assets/js/site.js b/site/assets/js/site.js
index ee4ea9f..7d0cc08 100644
--- a/site/assets/js/site.js
+++ b/site/assets/js/site.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		site.js
diff --git a/site/controller.php b/site/controller.php
index b0c16bd..9f6e2cb 100644
--- a/site/controller.php
+++ b/site/controller.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		controller.php
diff --git a/site/controllers/ajax.json.php b/site/controllers/ajax.json.php
index 0a4be67..40a244d 100644
--- a/site/controllers/ajax.json.php
+++ b/site/controllers/ajax.json.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		ajax.json.php
diff --git a/site/controllers/download.php b/site/controllers/download.php
index 864c40e..531488a 100644
--- a/site/controllers/download.php
+++ b/site/controllers/download.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		download.php
diff --git a/site/controllers/help.php b/site/controllers/help.php
index 5a4aa72..1a44de9 100644
--- a/site/controllers/help.php
+++ b/site/controllers/help.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		help.php
diff --git a/site/controllers/question_and_answer.php b/site/controllers/question_and_answer.php
index 9c66b88..1fc77d6 100644
--- a/site/controllers/question_and_answer.php
+++ b/site/controllers/question_and_answer.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		question_and_answer.php
diff --git a/site/helpers/category.php b/site/helpers/category.php
index b044254..e524e56 100644
--- a/site/helpers/category.php
+++ b/site/helpers/category.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		category.php
diff --git a/site/helpers/categoryquestion_and_answer.php b/site/helpers/categoryquestion_and_answer.php
index 4d5a078..858cf76 100644
--- a/site/helpers/categoryquestion_and_answer.php
+++ b/site/helpers/categoryquestion_and_answer.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		categoryquestion_and_answer.php
diff --git a/site/helpers/headercheck.php b/site/helpers/headercheck.php
index 1d6cfef..bf2d2cd 100644
--- a/site/helpers/headercheck.php
+++ b/site/helpers/headercheck.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		headercheck.php
diff --git a/site/helpers/questionsanswers.php b/site/helpers/questionsanswers.php
index d665dbb..502ba07 100644
--- a/site/helpers/questionsanswers.php
+++ b/site/helpers/questionsanswers.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		questionsanswers.php
diff --git a/site/helpers/route.php b/site/helpers/route.php
index fe3c859..c3ad3f9 100644
--- a/site/helpers/route.php
+++ b/site/helpers/route.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		route.php
diff --git a/site/language/en-GB/en-GB.com_questionsanswers.ini b/site/language/en-GB/en-GB.com_questionsanswers.ini
index 73d9990..c24ff92 100644
--- a/site/language/en-GB/en-GB.com_questionsanswers.ini
+++ b/site/language/en-GB/en-GB.com_questionsanswers.ini
@@ -18,6 +18,13 @@ COM_QUESTIONSANSWERS_DOWNLOADS="Downloads Per/Category"
 COM_QUESTIONSANSWERS_DOWNLOADS_DESC="Downloads per/category"
 COM_QUESTIONSANSWERS_EDIT_S="Edit %s"
 COM_QUESTIONSANSWERS_FILE_DOWNLOAD="File Download"
+COM_QUESTIONSANSWERS_FILTER_ANSWER_ASCENDING="Answer ascending"
+COM_QUESTIONSANSWERS_FILTER_ANSWER_DESCENDING="Answer descending"
+COM_QUESTIONSANSWERS_FILTER_QUESTIONS_AND_ANSWERS_CATEGORIES_ASCENDING="Questions And Answers Categories ascending"
+COM_QUESTIONSANSWERS_FILTER_QUESTIONS_AND_ANSWERS_CATEGORIES_DESCENDING="Questions And Answers Categories descending"
+COM_QUESTIONSANSWERS_FILTER_QUESTION_ASCENDING="Question ascending"
+COM_QUESTIONSANSWERS_FILTER_QUESTION_DESCENDING="Question descending"
+COM_QUESTIONSANSWERS_FILTER_SELECT_QUESTIONS_AND_ANSWERS_CATEGORIES="Select Questions And Answers Categories"
 COM_QUESTIONSANSWERS_NEW="New"
 COM_QUESTIONSANSWERS_NOT_FOUND_OR_ACCESS_DENIED="Not found or access denied!"
 COM_QUESTIONSANSWERS_NO_ACCESS_GRANTED="No Access Granted!"
@@ -53,7 +60,6 @@ COM_QUESTIONSANSWERS_QUESTIONS_AND_ANSWERS_N_ITEMS_UNPUBLISHED="%s Questions and
 COM_QUESTIONSANSWERS_QUESTIONS_AND_ANSWERS_N_ITEMS_UNPUBLISHED_1="%s Question and Answer unpublished."
 COM_QUESTIONSANSWERS_QUESTIONS_ANSWERS="Questions & Answers"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER="Question and Answer"
-COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_ANSWER="Answer"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_ANSWER_DOCUMENTS="Answer Documents"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_ANSWER_DOCUMENTS_UPLOADER_DESCRIPTION="<div id='uikittwo-answer-documents-uploader' style='display:none'>
 	<div id='uikittwo-upload-drop-answer-documents' class='uk-placeholder uk-text-center'>
@@ -120,7 +126,6 @@ COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_NEW="A New Question and Answer"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_ORDERING_LABEL="Ordering"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_PERMISSION="Permissions"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_PUBLISHING="Publishing"
-COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTION="Question"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTIONS_AND_ANSWERS_CATEGORIES="Questions And Answers Categories"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTION_DESCRIPTION="The question being asked"
 COM_QUESTIONSANSWERS_QUESTION_AND_ANSWER_QUESTION_HINT="Add Question Here"
diff --git a/site/layouts/question_and_answer/details_fullwidth.php b/site/layouts/question_and_answer/details_fullwidth.php
index 92f866f..cfdc63d 100644
--- a/site/layouts/question_and_answer/details_fullwidth.php
+++ b/site/layouts/question_and_answer/details_fullwidth.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		details_fullwidth.php
diff --git a/site/layouts/question_and_answer/details_rightside.php b/site/layouts/question_and_answer/details_rightside.php
index 069540b..49294f1 100644
--- a/site/layouts/question_and_answer/details_rightside.php
+++ b/site/layouts/question_and_answer/details_rightside.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		details_rightside.php
diff --git a/site/layouts/question_and_answer/details_under.php b/site/layouts/question_and_answer/details_under.php
index 86caebc..e24207c 100644
--- a/site/layouts/question_and_answer/details_under.php
+++ b/site/layouts/question_and_answer/details_under.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		details_under.php
diff --git a/site/layouts/question_and_answer/metadata.php b/site/layouts/question_and_answer/metadata.php
index 73ea074..cadbc06 100644
--- a/site/layouts/question_and_answer/metadata.php
+++ b/site/layouts/question_and_answer/metadata.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		metadata.php
diff --git a/site/layouts/question_and_answer/publishing.php b/site/layouts/question_and_answer/publishing.php
index 7c711e3..53ce223 100644
--- a/site/layouts/question_and_answer/publishing.php
+++ b/site/layouts/question_and_answer/publishing.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		publishing.php
diff --git a/site/models/ajax.php b/site/models/ajax.php
index e32bf36..d7ecf18 100644
--- a/site/models/ajax.php
+++ b/site/models/ajax.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		ajax.php
diff --git a/site/models/category.php b/site/models/category.php
index 2118fdb..d00297d 100644
--- a/site/models/category.php
+++ b/site/models/category.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		category.php
diff --git a/site/models/downloads.php b/site/models/downloads.php
index f1ded9f..9e2be15 100644
--- a/site/models/downloads.php
+++ b/site/models/downloads.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		downloads.php
diff --git a/site/models/forms/question_and_answer.js b/site/models/forms/question_and_answer.js
index e3fc70f..b75f56e 100644
--- a/site/models/forms/question_and_answer.js
+++ b/site/models/forms/question_and_answer.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		question_and_answer.js
diff --git a/site/models/question_and_answer.php b/site/models/question_and_answer.php
index 9237907..594e516 100644
--- a/site/models/question_and_answer.php
+++ b/site/models/question_and_answer.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		question_and_answer.php
diff --git a/site/models/questions_and_answers.php b/site/models/questions_and_answers.php
index 64dd737..856b2df 100644
--- a/site/models/questions_and_answers.php
+++ b/site/models/questions_and_answers.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		questions_and_answers.php
diff --git a/site/questionsanswers.php b/site/questionsanswers.php
index c7f717a..d5d1007 100644
--- a/site/questionsanswers.php
+++ b/site/questionsanswers.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		questionsanswers.php
diff --git a/site/router.php b/site/router.php
index 35f327e..2bb8975 100644
--- a/site/router.php
+++ b/site/router.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		router.php
diff --git a/site/views/category/tmpl/default.php b/site/views/category/tmpl/default.php
index 31c98f5..d527e24 100644
--- a/site/views/category/tmpl/default.php
+++ b/site/views/category/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default.php
diff --git a/site/views/category/tmpl/default_qna-table.php b/site/views/category/tmpl/default_qna-table.php
index 83b022e..8fbaf3b 100644
--- a/site/views/category/tmpl/default_qna-table.php
+++ b/site/views/category/tmpl/default_qna-table.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_qna-table.php
diff --git a/site/views/category/view.html.php b/site/views/category/view.html.php
index ab3db73..abe9d63 100644
--- a/site/views/category/view.html.php
+++ b/site/views/category/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		view.html.php
diff --git a/site/views/downloads/tmpl/default.php b/site/views/downloads/tmpl/default.php
index ba7b1ba..b39ea63 100644
--- a/site/views/downloads/tmpl/default.php
+++ b/site/views/downloads/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default.php
diff --git a/site/views/downloads/tmpl/default_qna-downloads-table.php b/site/views/downloads/tmpl/default_qna-downloads-table.php
index ef2aae5..a84fd97 100644
--- a/site/views/downloads/tmpl/default_qna-downloads-table.php
+++ b/site/views/downloads/tmpl/default_qna-downloads-table.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_qna-downloads-table.php
diff --git a/site/views/downloads/view.html.php b/site/views/downloads/view.html.php
index 171d484..c598908 100644
--- a/site/views/downloads/view.html.php
+++ b/site/views/downloads/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		view.html.php
diff --git a/site/views/question_and_answer/submitbutton.js b/site/views/question_and_answer/submitbutton.js
index 14c1071..09c6768 100644
--- a/site/views/question_and_answer/submitbutton.js
+++ b/site/views/question_and_answer/submitbutton.js
@@ -10,7 +10,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		submitbutton.js
diff --git a/site/views/question_and_answer/tmpl/edit.php b/site/views/question_and_answer/tmpl/edit.php
index 1f1abe9..73ad1f9 100644
--- a/site/views/question_and_answer/tmpl/edit.php
+++ b/site/views/question_and_answer/tmpl/edit.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		edit.php
diff --git a/site/views/question_and_answer/view.html.php b/site/views/question_and_answer/view.html.php
index be04e91..d3a0d17 100644
--- a/site/views/question_and_answer/view.html.php
+++ b/site/views/question_and_answer/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		view.html.php
diff --git a/site/views/questions_and_answers/tmpl/default.php b/site/views/questions_and_answers/tmpl/default.php
index 31c98f5..d527e24 100644
--- a/site/views/questions_and_answers/tmpl/default.php
+++ b/site/views/questions_and_answers/tmpl/default.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default.php
diff --git a/site/views/questions_and_answers/tmpl/default_qna-table.php b/site/views/questions_and_answers/tmpl/default_qna-table.php
index eb09302..064aea2 100644
--- a/site/views/questions_and_answers/tmpl/default_qna-table.php
+++ b/site/views/questions_and_answers/tmpl/default_qna-table.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		default_qna-table.php
diff --git a/site/views/questions_and_answers/view.html.php b/site/views/questions_and_answers/view.html.php
index 96c4be5..84288dd 100644
--- a/site/views/questions_and_answers/view.html.php
+++ b/site/views/questions_and_answers/view.html.php
@@ -11,7 +11,7 @@
 /-------------------------------------------------------------------------------------------------------------------------------/
 
 	@version		1.0.x
-	@build			6th January, 2021
+	@build			8th February, 2021
 	@created		30th January, 2017
 	@package		Questions and Answers
 	@subpackage		view.html.php