suppression "apply" button
+ some cleaning