Tidy unused server-side filtering; Fix copy-paste errors