CLSN-2120 all repository classes to have only queries - check and fix