added possibilty to search adress (not complete yet)