Fix check for empty_value in choice field form theme
merge