Fix add/remove selected-indicators