Change .content and .search
Merge remote-tracking branch 'origin/master'