Bug #1 fixed - selection highlight