bug fix and canonical url fix