further corrections for optimised local server
duplication of rest headers for local server operation