Bug fixes

Bug fix with multifield multitable joins