Variable names in merger.
Re-enable category related dialogs.