added means of getting waterway and datasource, temporary solution for crashes also found