add and remove availability elements; closes #886 closes#887