fix(declaration): address audit feedback on category step (#3324)

fix(declaration): address audit feedback on category step (#3324) #1705