Yep I agree with you Larson that this is probably the way to go. My issue is, apart from having to change all my forms, is that I don't know if this is what has now been decided or is it a bug? Only Support can answer but they haven't answered anyone's issues on 5.8 yet. So until they do I'll hold off spending the hours required to make the changes.
They are probably having a well earned rest but hopefully they start answering everyone soon.
Cheers Rod