Can we remove features in zoom handler -> this would reduce the else branch out