Add login requirement, cleanup cdb results.