Separating search and update

Shame on me for making this so unrestful to begin with