Gutted, re-built and repaired global filtering functionality