Fixed query/command bindings so they work at runtime