Merge branch 'fix/reorder-navigate' into 'master'

bugfix: navigate should be called after the data-src are updated

See merge request !16