Intermediate checkin. Adding both query and query list to intent.
Fully implemented using the query-list instead of query and query-word.
Merge branch 'query-history'