Fixed urls not included issue.
Code refine.