Fix tables and columns name resolution
Updated README