moved highlighting logic into subview