* Changed Query name matching to use regexp because sometimes there is no space between query name and final //