Fix EZP-22147: Use the template URI instead of manually building the URI with query parameters.
Fixed various CS issues
Merge pull request #40 from ezsystems/ezp-22147_template_uri_reloaded

Fix EZP-22147: Use the template URI instead of manually building the URI with query parameters