Attribute & validation bugfixes
normalize before and after Hooks