JSF check and fix added, fix not complete yet
JSF fixed, not ideal but not coupled to the scaffolding