Fixed 404 error to map into product
Merge branch 'staging'