Added support to have tags on the location field