2.3 compat: removed datasource, general cleanup, fixed issue with param values not being displayed unless $_GET was set