In then latest base, HTC added a feature, long pressing APP SWITCH opens MENU. I made another key remap, to re-enable the Search button
Before -
Menu - Opens Menu
Search - Opens Recent Apps
Long Press Search - Menu
After -
Menu - Opens Recent Apps
Long Press Menu - Menu
Search - Search
To apply, unzip the contents of the attached file and adb push to /system/usr/keylayout THIS IS NOT A FLASHABLE FILE