moved galleries call to after rescue
added nonempty scope and removed super params