improve search, creation