[#2145] Minor tweaks for UniqueEntity repositoryMethod option