Revert previous modification - dangerous to include eggs in search w/o requirement evaluation