better fix to unwrap/wrap the tables in the content zone