fixes #3681, disambiguate PK in findOne and findAll