Keyword dialog

Bug fixings for keyword wizard and keyword dialog.