Fix #12, beginning of tests #10, transient mappings, router search query change and more