updated code includes filtering and join studyspot features