Cleaned xml
Added search functionality