Updated values for types and all that. Javascript for filters
merged in leaves and resolved conflicts