Normalise query and filenames
Normalise query and filenames