issue#86 - Correct the table names in custom sql