Fix/ma query controller

see: https://www.openproject.org/work_packages/3336