Fixing delete queue and expiry scan over paging