cleanup template , fix selector with id