modified relationship handling for find