added search but still problems