Expand resource queries
Apply the required modifications for
backend-core#27 (closed)
, where necessary.