third batch of fix for swagger doc