fixed bugs with filtering and notifications