feat(plugin-beatsfoundation): implement feedback from PR #2452

feat(plugin-beatsfoundation): implement feedback from PR #2452 #547