Use faster query
Rename to reflect new functionality