[BUGFIX] ADWD-1466 Implement proper query in repository
Merge pull request #24 from subugoe/RepositoryHazzle

[BUGFIX] ADWD-1466 Implement proper query in repository