Only blacklist after limits. Plus a couple optimized queries.

Dan Notesteinrequested to merge
blacklist into develop

Merge request reports