Search API

Fix here too.