Updates

Selection logic update
Improve deletion
Improve filter