mapqueue improvement