Fixes #710, waiting on #840
Merge pull request #841 from mapbox/filter-omnivore

Fixes #710, waiting on #840