Hotfixing search API (master branch)