changed a lot more... remember to re-add pagination to table macros