Added a check if the location tag has already been added