[#2673] Dataset and Edit button updates.