Simplify highlight and select calls