adding support for query files and error reporting with file:line:column