Added keyboard update on selection + "end of edit" fix