[BUGFIX] ADWD-1466 Implement proper query in repository