Added subobjects, fixed tags dropdown