Shell for positional reactive query + some refactoring