Fixed bug : Location can contain only id