Fixed new bugs that appeared due to source website format change