adding autogenerate references
removing who filter and old/new column