Listing Form logic update