v1230 Improved tagging in catalog