fixing selector bugs