*Respect bb's isavailable property
*Encoding for upgraded files fix