revise #582 by changing the way how OPTIONS routes are added. refs #598