Work in progress: separate EntityFinder modukle with keyword search support; existing tests all pass