rewrite speciality report & move back the join