fixed search-function, need some more work