Filter functionality added.  Need to add OR filter functionality.