Fixed issues in TagPicker.
Minor changes to the rest.
Merge branch 'kostas'