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