fix:unable to display the first keyword when editing
update the place both my and other
clean up code