planning expanded highlighting support