Fix Object.Tag || Location logic