fixed ordering, added search