Fixing andX and orX with empty args