last viewed and map fixes