Fix query images for words with hyphen