Fix type search