Fix tables handling.
Merge pull request #7 from rxu/fix_tables_services

Fix tables handling.