Merge "CologneBlue rewrite: fix search form(s) generation"