Grid View - Fixed the issue with duplicate entries