Story 47568665: completed use of new deferred pattern in mapping controller