cleanup
ref #6903 allow preferences for distribution area vocabulary and distribution status
fix compilation exception
ref #6903 cleanup and refactor distribution editor