Enrich sample as we have room, fix formParam