Fixed selected location updating