- Don't use APIs deprecated in Sprint 34+ (still backwards-compat, though)
- Provide a label for use in Sprint 34+
- Simpler way to check for query prefix