Added subquery expression stuff for right hand side