Changed filename to put query at the beginning