few selection issues fixed