Improvements for SnappingAgent and FeatureGrid