Fixing data and replacing an or with an and