refactoring
client preselection based on previous metadat