swagger followup
fix model recursion
fix code review issues