Added menu support and control when empty values.