SSP-2327 Clear filter studentType on close
SSP-2327 Code cleanup