more work on multi table source