Untangle standard fields from service fields
Experimenting with rewrite rules
Minor cleanup