Edit/new fix, as well as keyword trim