Fix issue with ids and some js changes