This is part of solution to fix the issue Multi kind search does not work with more than approximately 85 kinds