closes #180 and #194 and makes other changes to default search behavior