Merge pull request #115 from Rakeshadlagatta/obsplatform-2.03

NationalId added to file
sortBy changes