Add support of form locator by name. Still many match errors during DescriminatorType pattern match, and need to be fixed.