Also reduce queries for maps

Get related objects in one query