make query parameter name configurable; finish fixing copyrights
apply patch feedback