Lots of changes to accommodate more advanced variety searching