added search (total crap, but it works)