Enhanced detection of form (all numeric values are now supported)