Fix #237 expand trigger problem
Fix #243 improve expand target behavior