Update

Mostly refactoring--condensed all the searches into a single action (with case conditionals).  Not strictly necessary, but makes the code a little skinnier.