Add special mark for expert comments
Fix policies