Split method in ByPropertyValueEntityFinder

Change-Id: I7e692d82deb145d0f2f99bbbb8654f5b8413d581