fixed null and integer values in response