Fix #26: Fix handling of  search parameter.