Same fix for option and category. Make dirty while initializing.