Re [1]: I'm not sure if this is what you mean, but maybe set up "vector" as an independent label rather than an alias, have it display "linear algebra" just like it used to, but have it sort entries into a cleanup category?