Fix issue with null and blank param that was set always for True