Merge pull request #1486 from marcel-blonk/PLFM-2940

make query calls async
Merge pull request #1487 from marcel-blonk/PLFM-2940

build fix