Issue #85 , restore the filter
Issue #85 , change the view and add cancel button