fixes on selections