prevent for returning while false normalize string
added more places where normalization is needed