Make sure the filename is cleaned here as well.