Added a lot more features to the query.  Newer version of MetaHub.