Lost of changes to list and search
minor changes to the dataservice and items