Finish pwpbm integration in contenthandling and (youtube) fixups