Fixing system landing page system collection queries