Fixed up issues with Search
Fixed main page showing duplicate results
Split up Search function