More responsibility moved to EntityItem from ApplicationsIndex