Better search strategy, database improvements, still far from good, but improving :-)