Porting fixed date default and some other minor cleanup from the esearch branch.