[enh][mod] better query parsing ++ selecting categories with query strings