Revert "Revert "made focus date work again""

This reverts commit 4a8a196e2deadc191ced85a9d32b891a8ed7c01c.