Fix indent and search