Fixed check conditions like createUrl