Combined these code paths. Probably eventually we should let plugins also take the query into account and set their label accordingly (in case they handle more than one prefix), but that seems like a bigger change.