Fixed custom fields issues