making search generic, adding expunge, backrevving