Consistent treatment of search terms; update comment..