Fix: performance issue of Live filter of Custom field with Checkbox type

Reverted change to wrapper element when replacing layout which might cause theme layout issue.

Fixed a small potential JavaScript issue of Replace Layout feature when the wrapper element has no class attribute.