Rewrote query interface, introduced show collections