CB-2666 / CB-2631: Added a bounds reset for the availability cell. Added more comments.