Query tuning for the expire / delete selections + cosmetic stuff.