FIXUP - fix indenting in SearchReader.
FIXUP - reorder lets and before block in SearchReaderSpec.
FIXUP - fix indenting in SearchReaderSpec.