Reduce potential request-flooder

closes #8