Fix issues with extension ID and a couple of other tweaks
Finished feature 59312964/at-sign.