Fix queries

Move options responsability to query.