Fix: OS X filter yields 0 results
merging fix.
Merge commit 'bde4f4dd4fb552679e5bae57d86dc7ceee29b3f7' into tidy