#8 Plugin selection improved