Made query strings more readable