fixup! fixup! allow scalar functions in where clause and order by clause to use more that one reference