Add alias for PNG and JPG (capital letters), and restore C-R history search