micro bug fixe and clear queue issue fixe