use the map with feature id as key instead of the old function that run through the hole feature list to find a feature