SelectAll logic update