Fix to allow aliases in join builder