Added Filtering Functionality

Requires db update