Improved performance on assets call.
XML clean-up