Correctly handle existing URL params
Make events trigger sooner