fix flaky tag ordering.
test SiteController.
minor refactor.