Fixed handling of the filter param, which is non-mandatory and adapted the template rendering to be worded generic instead of referring to the filter only.