Moved further queue handling after package manager call to map restore callback to avoid problems related to processing while map isn't completely restored;