cleanup
plugin advertiser: support no extension files
scopes: restore selection and model (IDEA-115393)