Adding producers filtering and more Angular magic