Arvind - Addding Tagging of location feature