#16 Minor improvement to marquee incremental selection