Add support for query paths in goTo