completed basic refactoring of the storage model for record filters (minus any backward-compatibility, which will require subsequent migration for previously created content-based record filters).