fixing extra selection bugs