Fixed semantic search problems with API reusable class