Queries to the dictionary are now properly encoded