I see the top comment in your top link makes the same recommendation I made in another comment here (https://news.ycombinator.com/item?id=40720789).

If it works, you should definitely solve the problem for yourself even before booking.com eventually suffers enough to address the problem more generally.