Improve bot selection logic