TODO: remove forced client filter