Updated the way how the order placeholders are set