Don't rewrite a request's ActionId if it's already especified
Improve line parsing