search form has proper params
cleaned up energy_data controller, minor changes to routes