Feature/query save bugs 8002

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