updated mapbox layering system with new filtering