Tidy up revised score event handling
Deep linking

Part of #210