Fixed #18 and a number of other cleanups making the tire searches consistent