Fixes in selection mechanism

Some fixes in section to avoid bugs