Implemented DomainQuery basement
Small tweaks
Merge branch 'domainQuery'