New normalization rules.
Added search function to main method.