Merge branch 'hotfix/nav-sort'
inject correct query builder
Merge branch 'hotfix/sitemap-service-configuration' into develop