Misc2

Small miscellaneous PR: quick fix for admin search; refactoring; copyright upates.