Fix AP highlight in some situations