nojira: Streamline bucketizing of connected services in angular settings controller