Merge branch 'fix_range_limit' into 'master'

Use selectors instead of select

See merge request !126
9 jobs for master
in 1 minute and 37 seconds and was queued for 9 seconds