store: Some form tuning