Updated to include reference information and fix filtering

Updated to include reference information and fix filtering