[#759] Fixed overall responsiveness
Merge pull request #920 from akvo/issue/759_rsrv3_templates

[#759] Fixed overall responsiveness