Fixes to core_tags