Hotfix/fix reappearing hidden fields core 402