task #046-Search_setup: Search form updated.
Merge branch '046-Search_setup' into develop