fix table search (not tested) #21