search now searches in more fields