further adaption to cover all cases; better logic for handling text in numeric fields  e.g. DQ; html page now allows selection of data source