Re-worked handling of aliases for data versus index table