Handle pat query strings consistently.