use better test for presence of individual controls
have to reorder controls in some cases