Rearrange app controllers so query mirrors finder