add some filter for client and repair