Improved searching for theo