Support for names, added clear button