more work on search
Merge branch 'master' of https://github.com/cybrown/supbook
merge