WP-2354 Added code to clear each value, if nothing is passed in