[xhamster] Fix and improve