Fallback solution for searching
fixed failing tests