OnionXLayer: Extraction: Fix some controls bugs

Fix some controls bugs