Updated Filter and Database usage. Preparation for BOOL Type Filter