Improve category values submissions