Usage of normalize_token function in observer + small cleanup
Add + sign in the string normalizer function