merge

Added fallback methods, returns the unchanged prompt if fails, also added context appending rule based

Query rewriter class added for stronger context preservation