New version of parseQuery 1.1