added handling for neutralized filenames and solved two typos in queries