Always allow OPTIONS and HEAD

- Added logic to ensure OPTIONS and HEAD are always allowed