Added filter history support;