Initial work on the dictionary query
Dictionary query is now ready to be tested.