limit auto :format  and constraint for :controller segment

These changes seemed to give us results closer to what we expected, maybe worth looking at