Use correct dictionary key
Moving handlerParams because they were being set too late