Fixes #264 Moving redirectes & counter

For the feature branch