Mall control: Performances fixes

Improved performances