Fix selectino highlighting