Got the dynamic filtering for the calculate form to work, and added the safe folder