Merge pull request #2407 from colemanw/ajaxSearch2