Added onSwap event to Q/drawers