Fixes to non-cached vector layer join

Fix for bug 7743