Changes to query expansion code in omega.