- Changed SQL for HaV data model. Should be separated as a plug-in or
configuration