Merging of the 2 search pages. Minor bug fixes (removed duplicate records in the results, better selection of the tab on page refresh, dont run the three searches on the review view pages...) and code cleaning (JIRA 89)