Added filters and proper preset storage