Live search and substring search added