Small fixes and start of small upgrade of recommendation controller