Locate is fixed and viewer is updated