I'll try your suggestion, but changing all my forms would be endless work.

There is probably no need to change all your forms < s >. If it ain't broke, don't fix it.