[FIX1303] Hide header
[FIX1303] Fix logic