Refactory statement/handler to make parameters available
Remove useless parameter substitution (will let handler do his job)
Fix specs