There was an ugly if/else in the view script, this patch creates two of them and adds friendlier search suggestions.
Thomas Gelf