Fixed bug with not recognizing City/Country semantic types in arg2terms, fixed bug in not adding terms in arg1terms and arg2terms to solr query string