Fix for tool lookup order, add information about tool used