Add executable query parsing, ignore params in comments