Removed duplicated code
Added search results to the template so they show
Merge remote-tracking branch 'origin/dev' into test