Fixing issues with search api