FTS-165: Fixing OPTIONS handling