Moved compartor to LocationEntry