Updated form details with new filtering code (currently commented out)