Use explicit property for context catalog id bookkeeping

Move from using tags to set the context catalog id to explicit properties.