Added changes for the filter feature that were done by Stephan Wlodarczyk. Brought these changes over to my my repository and tested.