small fixes for context-navigation