Cleanup of some code and added $emptyValueIsNull argument to Option and FilterInput to avoid "null !== "