Improve analysen in nav