Storing location objects and returning an object instead of just an ID

Kevin has suggested results first and metadata second, however James has metadata first, and results second. We've opted for a fifth opinion on the matter and Owain has agreed with metadata first and results second. If you really do strongly think it needs to be changed I can change it, none of us really feel that strongly which way around the arguments are passed.