@vocab support
fixed some @vocab-related bugs