changes to filterable columns
Refactored code and made some API updates