Remove use of direct GET params from template