Adding (unoperational) search and other changes