Fixed exclude and current version scopes