Updating style
Adding name filter
Improved filtering speed