Handle empty search results correctly
Merge branch 'develop' into testing