Availability functionality updated

Not getting expected results