Adjusted filtering to address issue #85