Fix for collections with "." in table_name