Fix TC-1879: removed else if condition and corrected url mappings