Better picking of elements logic to avoid moving fieldsets