* Add more component query benchmarks. * Rename benchmark (cherry picked from commit 6e83c4d570eff90dc461e1f252b9d2199fcf4182)