ayourtch Add some query parsing