staaplc updates for new dict format
empty fix