Used n: macro
Updated condition in default tempalte