Updated request parsing to allow for spaces and dashes (converted to underscores)