Improve request regex, add more logging