various enhancements

the searching issue is fixed! when you search by a number, it is both
fast and only returns the proper number of results