partially fix <code> bug whit empty list in same field
Merge branch 'bugfix'