A possible workable version of Howards pull request

This is part of the other change we made
* so that the short text is also searchable