Ezp21069: Cover draft search

Archived version was covered, added draft version.