Finished updating search by versions.  Removed query use to be more declarative.