Fix for finding in images which used underscores

FIxes EUCA-9068