for #192, filtering, fixes