Add range borders fix to match visual
Fixers
Add tests
Fix leaking variable