Modified for CMSMS 2.0 compatibility. Improvements for search functionality.