Added finding type to the fieldset as well