Added option to search in names only