fixed UI handling of context-path and non-context-path use cases.