Add optional role search to avoid problems with chef indexing delays