SSP-2562 - Enhance Student Search to Include Watched Students