Clean up Query/TestCase picker