Better SmartComplete behavior