Fix search API
Merge branch 'master' into apitoken

Conflicts:
	data.go