staff and equipment mapping fix