Hotfixing search API (develop branch)