Last changes to ensure overview tables are properly read. Not sure if it works. Better test before using this.