REQS-77 - all data can be captured from sources when running a view

Address review comments