refactor and fix amenity-points

next part of #710