~ fix user and org search