added a flag for forcing the current location to be displayed