Improved service preferences handling. Thanks to Dominik Klein!