(master) big changes to all routes. replace user's 'location' with a combination of 'site' and 'site_type'.