Improve KunenaObjectFinder implementation