Fixed current location

Fixed current location broken when I changed the current conditions
partial page