Fixed issues in hashtable and list