Simplified the work to work as in oq-lite
Simplified the work to work as in oq-lite


Former-commit-id: d0b7775cb1d9828d4f70942958a2596b3ee58083 [formerly 9cf8fe5b6313e964eed34211e7d5cd3733cd4f5e]
Former-commit-id: 26461cee435fdb63b85fe9d71424fd62947520ae
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine