"Will to Survive" incorrect cd duration

[Blastulaa]

Hiya, I've added will to survive (human pvp trink racial) manually via add spell ID, but it's showing a 30s cd duration>not 2min as the actual duration is. (cataclysm version)

And i've got a suggestion/request; would it be possible to sort the CDs shown by CD duration remaining?
(ive got it centered/growing from the left side, would love for the shortest remaining CDs shown to be sorted with longest towards the left, and shortest to the right) if at all possible :)
I reckon lotsa ppl would appreciate this potential feature.