Fix highlight feature during query layer