I like having the HD channels next to their counterparts (i.e. HBO HD channels next to all the rest of the HBO channels). Therefore turning off the mapping under the local settings wasn't the solution for me. I just made a new favorites, and titled it "HD NO PPV" (I also don't like scrolling...