Fix findClash by adding extra case in search