Case navigation is somehwhat displaying correct data now