CLSN-1518 Change Api Queries for Filter