1.make query expansion more configurable
2.renaming