Add "government" kind for county and federal services

kind parameter now matches the display text to make it easier for clients to use