Better handling of param switches