fixing dropdown support in Settings.prepare
tweaks to topic locking