Added additional filters