Managing queries is under queries

Closes #38