More accurate navigation on history back to products tile
Merge branch 'dev'