Org search cleanup