Correctly append ? or &
Fix notifications.