Fix typo
Simplify query execution
Escape navigation tree item names