fix for #121, filter feature wasnt working correctly