Move the build query script (and tidy up term indexer)