LUN-810 -- improved query by using select_related
Merge pull request #25 from pbs/LUN-810

LUN-810 -- improved query by using select_related