Updated QueryExpander with new mapUri and some bug fixes