[#527] Avoid extra requests

This calls produce the same request twice on Firefox
Merge pull request #528 from akvo/feature/527

[#527] Avoid extra requests