Vikash, Vinay | #1268 | Ensure observations only show up if they are part of a template
vikash | vinay :: 1268 :: Changes retreival logic for template