Fix content reordering validation errors

#19