Fixing up get_default_site_app to be a bit more flexible (part 2)