Handling source list change better