GPII-784: Adressed most of antranigs comment - only one for ontologyHandler.js left
GPII-784: Addressed the rest of antranigs comments on pull request
GPII-941: Merged in latest changes from GPII-784
GPII-941: Addressed some further issues pointed out by antranig regarding ontology handling