#113 adjust focus traversal order