Improve entity recognition, wait time for crawler. Add query string option