Selection/highlight bug fixes