use plain table name if available and add index only if needed

use plain table name if available and add index only if needed #116