Unwanted options are now discarded on the client