Improve range selector

see !470 (comment 326146)