Don't unhilight children when moving from target to passage
Improvements to scanning and preview