Added UI option to disable comments and fixed empty custom flag when no flag is added