remove pagination and raw query