Category search mostly works!

Not yet hooked up to save...