Fixed minor issues with filtering