Removed translation queries
Merge branch 'refs/heads/optimising-survey' into staging