Added nested form for match feature