Some changes in response to testing
python is certainly a requirement
Switched to using a search-provider system, to make it more extensible