Fixed some additional code that was added by the merge. Also tersified some of the autocomplete code in edit controllers.