Made expand/contract sticky across operations (by adding sticky valud to DB).
Works, but other parts inconsistent.