added more restrictions due to poor api performance.