bug fix & minor tweak

Prepare for the logic of recommendations