Minor tweaking to reduce RABL database calls