Fixes : Issue IDS - 7,8,10 and 14