Simplified request finding and took out helpers
Renamed sitecatrequest so its lowercase - less confusing