rewrite rendering with lookup of params

test improvements