Added a filter field and updated the config file
Fixed up some comments
Merged pr and fixed conflicts