Fix custom fields tab