Query UI fixes
Fixed 2 navigation errors that occurred in navigation cancels.
Update to nav cancellation fixes