Search done, need to bugfix