[WIP] improve incremental highlight and moving highlight