Fixed visual selection issues