Multiple enum autocompletion corrected (closes #3817, closes #3818)