FIX Search mechanism bug