Moshe have upgraded Alex Reisner's excellent http://drupal.org/node/39179 patch. Please review, this is an essential one before releasing 4.7 This patch and the like are (one of the) reasons for form API