fixed random ordering on selectors

and change again labels for the windows options

a couple of checks have been also removed with the refactoring
but they were no needed as the methods were invoked only internally
with a controlled set of valid parameters