restore has filter & fix bug