fixed some match bugs in the availability class