Back bug fix.
Merge fix
Small fixes in new search classes
Merge branch 'dev' into search
Fixed search results going to detailed view