Fix up the broken scenarios (incorrect calabash query).