ISO27001 ISMS internal Audits

[magic-k]

I have a few questions about Ciso Assistant in an 27001 ISMS

1. If i do internal audits and i find a NC or OFI, i would like to link a finding/follow up to this audit, so i can track the remediation. But as far as i see i can't link a finding to a specific audit or vice versa.
2. We span internal audits over a time frame of 3 years where we try to cover every control at least once. To do this we do partial audits (only a group of controls with a certain division e.g. all controls about employees concerning HR)
   The Audit module seems to only know complete audits covering all controls.

How is everyone, who needs 27001 compliance, is using Ciso Assistant for daily work? Risk Assessment, BIA etc. work great but i feel that my work flow is not compatible with Ciso Assistants audits.