CLSN-1609remove duplicate queries from Repository/api