Fix search and add support for larger images