Fixes for dream tags editing