Rewrote SearchTags in Pascal case per ReSharper; also other minor refactorings