fixed site and replaced custom fields