Made the filter by class functional, parsed class in api to string