clear-queue-non-current: Work around PostgreSQL query optimizer stupidity
Fix broken redirects