closes icarus/mom-ca#15
modifications for icaruseu/mom-ca#165
minor changes for single charter view