Filtering requests again on client

Filtering requests again on client