included change option tags and fixed change option for users