Refactoring
Working API for Filters and Watchlists