Fix #160 and #166: Context tabs are now working to separate categories. Started with #161.