Explore Tool refactoring (APOGEE queries)