Use querystring, stop manually building urls