working on search page...again
Merge branch 'Joseph'