CLSN-1609 remove duplicate queries from Repository/api(generic)