small changes in handling tags and sites