filter by site, UI adjustments