Updated so that indexer is released quicker, plus added validation and
keyword search options