Updated API, added QueryType feature.
Removed QueryType again.