Improved image filter code, resolving #5
Handling no results deu to initial filter, fixes #1