filetree again, apply last fix to context menu as well