Use ; to separate filter fields, minor fixups