changed searchByName method

Also updated get/modify/remove methods to include both TreeMaps where
required.