Various tiny Mods
Query parser (raw)