Added Logic for filters