Issue #457 - Changing search to contains instead of startWith