Updated query browser to deal with generated compilation units