Fixes Minor issue with filtering