query expansion made easier + fix class instance variable issue.