Rework to make query string a lot shorter.