remove N + 1 query in new RABL file