Adding substring search functionality