Handle hidden fields in CMS tabs

Closes #12 #18