BK-749 Better nav parsing