Add filtering
Fix filter description
Add filter clear button
resolve merge conflicts