Adapted to new expression search api.