Queries for current_{next,future} are still broken

Broken due to my own incompetence to test with fitting databases – it just uses all terms.