Cleaning up handling of the page when no order cycle is selected
Patching up the shopping spec