Added the ability to switch between basic and advanced filtering methods