Fixes in templates tag(remove Shop tags from core)