Build Logical filter testing. Fix issues in logical conditional structure.