Added fix to handle non hmac requests from being miscategorized
Added temporary fix for random crash while choosing request options