Decode fail fixes
Further crawler's fixes