changed table handling due to libxml issues