Add substring search WIP