Merged range fix with feature layering fix