Changes for new school year. 

Removed urlencode() for $filter.