WIP fix on persistent picture on change category