[APS] Always complete item. Minor tweaks.