SQL optimizations for laoding subscibers
Merge branch 'feature/166' into develop