query API reduction + shelve support dropped