Added options to pick services to query.