Fixes for tables for single quote