fix insane code and add markup for taxonomies