DB/SAI: Some SAI for aq20. Closes #8866
DB/SAI: Fix a couple errors. Closes #8839