Fixing some bugs in controller edit item 21713 930AM -ian