Analysis Controller, fixes for Resources Controller