Fix for issue #11 - Max key length exceeded by referrer