Add generic name param. Fix removal of all filtering