Improve search, add version