Replace more problematic uses of "SELECT *"