BUGFIX: Moved all dataSource hacks into a special case handler when submitting forms