Fix custom field bugs'