Search is now working

Final fixes added so that search works from the general search page.