Fix searches on enum values