Fix OPTIONS request for single resource queries, refs D337