Added "hierarchy" feature to Date and geocoord annotations. Changed name of annotation from "date" to "Date"
Some more bits for General Purpose Extractor