fix filter last selection not restored / simplify