Fixed search read more, other cleanup