Added a filter to search images
Merge branch 'feature/hotfixes'