Wip on query sanitizer