Fixed searching and indentation