Merge "Fix some issues with the last used entry"