Bugfix20140817

If 'search' does not exist or contains null then the default value 'none' is not passed. In the original code (not the current broken one) this was expected behaviour