Attempted fix to filtering.