Fixes #264 Moving redirectes & counter