Fixes for the ListTags handler