Improved chunk unload queue, possible fix for #1661