[#2787] Fix smart searches and enums.