Move plan filtering to client