Removed useless table name storing and fixed related bug.