Refactoring admin reports

refactors how ES arguments are passed from the configuration to queries

@emord 
fixed