Replace Query keyword by Filter one