I'll second using F7 for the old F8 behavior, since it and F1 both serve the exact same function. Having the ability to selectively target the closest enemy or the closest NPC would be an improvement over both the old and the new F8.