Fix loaded location location and filename tracking