Fixed bug with location on index
Futher update to last bug