Refactored Table functionality
refactored table filters