category edit fixes
category edit merge