Fixed a bug with searching for images. Minor constant name refactoring.