Fixed bone-headed filteredBy code

Was agonizingly slow computing intersection between filter and discrete
feature.
Merged improved intersect to index