better parsing of custom fields, add url