Fix ambiguous id column with includes and where