Quick and Dirty Auto Search - improvement needed