Improve description switching