messages: Keep hyphens and quotes when preprocessing query string.