OK, a few thoughts on this one:
1) Like silverquill pointed out, be careful about major alterations.
2) I find the idea of a bicycle tender category very useful. I cannot find these searching google. I cannot find these opening up a yellow book. Although many exist, that doesn't mean every place of business/public area has one. Knowing where even the plain ones are is very useful to a bicyclist, especially if they are in an area that they aren't familiar with.
3) Based on #2, I would recommend (although I'm sure many would disagree) that instead of re-working that category, create a new category for unique ones.