form and wildcard Changes

Modified the form and change wildcard to be consistent with entity