Updated selection for single-stack - added logging