Fixed dataset issues on topic edit #617