Need review for my REST query (template modification)