Category Change fixes

Made a change to hopefully fix the slow reset of category changes due to
events