Search tweaks.  Stat CMS fix