refactored commentsearch and updated es tests