#205 Fix 'by site' listing