change queries, add more natural queries with "?"