Open_class_category tag fixes

Some fixes for the open class category tag (as well as the original relevant commits). Addresses the comments raised in 96e4ee825097af552c1b5e7dbac40f9f93322cb3.

@pteromys, @jmoldow -- Can you take a look over these and let me know if the changes looks good?