added additional logic for already normilized fields