Extract queries and facades

Merged Peter Stanko requested to merge xstanko2/portal:queries-extrac into master

Merge request reports