SSP-1792
Student search query executed twice per request