Remove normalize-string, substring-before; Replaced with contains

Bugfix for #4 (see comment in #4).