Modularised the search page. All code related to content types has been moved out of the core search view and templates. (JIRA 90)