Increase render speed and fix double adding users/albums