Fixed join issues in new virtual tables

Change-Id: I8a728f458f85c192db206c14afa67b671390d90b