CRM-14961 Fix

Labels and merging multiple subtype fix for CRM-14961 https://issues.civicrm.org/jira/browse/CRM-14961