Fixed formatting
Added substring search.