Code cleanup and renamed hard tags HARD_TAG_PUB to HARD_TAG_ PUBLIC and HARD_TAG_SUB to HARD_TAG_SUBDOMAIN