Fixed 'Bug 21237 - Underscores are removed from "Resolve" options'.