LUN-810 -- improved query by using select_related