prevent 0 length query from hitting socket
added Localized CM Names