fixed bugs - null values were getting populated in some fields