map filter styling
fix merge conflicts