Fixes/angular query setup

https://www.openproject.org/work_packages/5771