Support custom query params for template again