Potential solution to earlier issues with query in api. Will merge into...

Merged Ian Foster requested to merge unit-testing-backend into develop

Potential solution to earlier issues with query in api. Will merge into develop for further manual testing

Merge request reports