Final changes to staff and subareas filter, see CHANGELOG.txt