Data search prototype updated; converting some units; added units for metadata